Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d22e9306 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_dio200: Use module_comedi_{pci,}_driver() 



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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6e11e3b

drivers/staging/comedi/drivers/amplc_dio200.c

+10 −41
Original line number Diff line number Diff line
@@ -482,7 +482,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,
@@ -493,58 +493,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)

{

	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)

};



static int __init driver_amplc_dio200_init_module(void)

{

	int retval;



	retval = comedi_driver_register(&driver_amplc_dio200);

	if (retval < 0)

		return retval;



	driver_amplc_dio200_pci_driver.name =

	    (char *)driver_amplc_dio200.driver_name;

	return pci_register_driver(&driver_amplc_dio200_pci_driver);

}



static void __exit driver_amplc_dio200_cleanup_module(void)

{

	pci_unregister_driver(&driver_amplc_dio200_pci_driver);

	comedi_driver_unregister(&driver_amplc_dio200);

}



module_init(driver_amplc_dio200_init_module);

module_exit(driver_amplc_dio200_cleanup_module);

module_comedi_pci_driver(amplc_dio200_driver, amplc_dio200_pci_driver);

#else

static int __init driver_amplc_dio200_init_module(void)

{

	return comedi_driver_register(&driver_amplc_dio200);

}



static void __exit driver_amplc_dio200_cleanup_module(void)

{

	comedi_driver_unregister(&driver_amplc_dio200);

}



module_init(driver_amplc_dio200_init_module);

module_exit(driver_amplc_dio200_cleanup_module);

module_comedi_driver(amplc_dio200_driver);

#endif



/*