Re: [PATCH 00/48] staging: comedi: avoid using comedi_board()

From: Greg Kroah-Hartman
Date: Thu Sep 11 2014 - 17:37:46 EST


On Thu, Sep 11, 2014 at 05:57:34PM +0000, Hartley Sweeten wrote:
> On Tuesday, September 09, 2014 3:26 AM, Ian Abbott wrote:
> > The `comedi_board` inline function takes a single parameter of type
> > `struct comedi_device *` and merely returns the value of the `board_ptr`
> > member therein. This is somewhat superfluous as the member can be
> > accessed directly.
> >
> > Replace all uses of `comedi_board(dev)` with `dev->board_ptr`.
> >
> > Note, if there are any conflicts when applying this series, they can
> > just be skipped for now and corrected later.
> >
> > A subsequent patch will remove the `comedi_board` function, once there
> > is nothing using it.
>
> Greg,
>
> Just wanted to give you a heads up on this series and the ones I have
> posted. The series are:
>
> >From Ian, [PATCH 00/48] staging: comedi: avoid using comedi_board()
> >From me, [PATCH 00/30] staging: comedi: adl_pci9118: continue cleanup
> >From me, [PATCH 00/34] staging: comedi: cleanup async cmd->stop_{src,arg} usage
>
> There are a couple conflicts between the series from Ian and my two.
> If you drop these two from Ian's series:
>
> 06) staging: comedi: adl_pci9118: replace comedi_board() calls
> 10) staging: comedi: amplc_dio200_common: replace comedi_board() calls
>
> The rest will apply cleanly in the order above (assuming I didn't miss anything).

I applied all of the above, with the 2 patches from Ian going last and
git handling the merge issues.

> Also, Ian had a couple issues with patch 07/34 and 08/34 from the last
> series I posted. I already asked if you could drop those two. I needed I
> will repost the series.

I've dropped them. Hopefully I got it all right, it should all be
pushed out now, verifying this would be good :)

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/