Re: [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver()

[Greg KH]

On Wed, Jun 20, 2012 at 06:16:52PM -0500, H Hartley Sweeten wrote:
> On Wednesday, June 20, 2012 4:13 PM, Greg KH wrote:
> > On Wed, Jun 20, 2012 at 03:56:50PM -0700, H Hartley Sweeten wrote:
> >> If PCI boards are supported, use the module_comedi_pci_driver() macro
> >> to register the module as a comedi driver and a PCI driver. Otherwise,
> >> only ISA boards are supported to use the module_comedi_driver() macro
> >> to register the module as a comedi driver.
> >> 
> >> Refactor the code a bit due to the use of the module_comedi_* macros.
> >> 
> >> Rename the comedi_driver and pci_driver variables as well as the pci
> >> driver related functions for aesthetic reasons. This makes the skel
> >> driver conform to the changes to the other comedi drivers.
> >> 
> >> Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> >> Cc: Ian Abbott <abbotti@xxxxxxxxx>
> >> Cc: Frank Mori Hess <fmhess@xxxxxxxxxxxxxxxxxxxxx>
> >
> > This patch fails to apply:
> >
> > patching file drivers/staging/comedi/drivers/skel.c
> > Hunk #4 FAILED at 543.
> > 1 out of 4 hunks FAILED -- saving rejects to file drivers/staging/comedi/drivers/skel.c.rej
> >
> > Care to rediff it and resend?
> 
> Hmm. It was based on next-20120620 and created with git format-patch.
> 
> Do you have any other patches to that file in your staging tree that
> have not reached the next tree yet?

Possibly, depending on when -next was created, I did just apply a bunch
of other patches a few hours ago.

> Regardless, I have some other cleanup patches for that file. I'll
> put them together as a series and repost it later.

That would be great, 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/