RE: [PATCH 2/7] staging: comedi: amplc_dio200: Use module_comedi_{pci, }_driver()

[H Hartley Sweeten <hartleys@xxxxxxxxxxxxxxxxxxx>]

On Thursday, May 31, 2012 6:09 AM, Ian Abbott 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 so use the module_comedi_driver() macro to
> register the module as a comedi driver.
>
> Renamed 'driver_amplc_dio200' to 'amplc_dio200_driver' and removed
> 'driver_' prefix from PCI related functions and variables, purely for
> aesthetic reasons.
>
> Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
> ---
>  drivers/staging/comedi/drivers/amplc_dio200.c |   51 +++++--------------------
>  1 files changed, 10 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
> index f8c9057..2167697 100644
> --- a/drivers/staging/comedi/drivers/amplc_dio200.c
> +++ b/drivers/staging/comedi/drivers/amplc_dio200.c
> @@ -484,7 +484,7 @@ struct dio200_subdev_intr {
>  static int dio200_attach(struct comedi_device *dev,
>  			 struct comedi_devconfig *it);
>  static void dio200_detach(struct comedi_device *dev);
> -static struct comedi_driver driver_amplc_dio200 = {
> +static struct comedi_driver amplc_dio200_driver = {
>  	.driver_name = DIO200_DRIVER_NAME,
>  	.module = THIS_MODULE,
>  	.attach = dio200_attach,
> @@ -495,58 +495,27 @@ static struct comedi_driver driver_amplc_dio200 = {
>  };
>  
>  #if IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI)
> -static int __devinit driver_amplc_dio200_pci_probe(struct pci_dev *dev,
> +static int __devinit amplc_dio200_pci_probe(struct pci_dev *dev,
>  						   const struct pci_device_id
>  						   *ent)

You should also pull back the indent on lines above and move the "*ent"
part up:

					    const struct pci_device_id *ent)

>  {
> -	return comedi_pci_auto_config(dev, &driver_amplc_dio200);
> +	return comedi_pci_auto_config(dev, &amplc_dio200_driver);
>  }
>  
> -static void __devexit driver_amplc_dio200_pci_remove(struct pci_dev *dev)
> +static void __devexit amplc_dio200_pci_remove(struct pci_dev *dev)
>  {
>  	comedi_pci_auto_unconfig(dev);
>  }
>  
> -static struct pci_driver driver_amplc_dio200_pci_driver = {
> +static struct pci_driver amplc_dio200_pci_driver = {
> +	.name = DIO200_DRIVER_NAME,
>  	.id_table = dio200_pci_table,
> -	.probe = &driver_amplc_dio200_pci_probe,
> -	.remove = __devexit_p(&driver_amplc_dio200_pci_remove)
> +	.probe = &amplc_dio200_pci_probe,
> +	.remove = __devexit_p(&amplc_dio200_pci_remove)

The '&' is not needed, the functions are already pointers.
Also, there should be a trailing ',' on the last line.

These comments are also applicable to your similar patch for
the amplc_pc263 driver.

Regards,
Hartley

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel