diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-04-23 22:24:24 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-24 18:38:36 (GMT) |
commit | db0eaeed6493fed37382fc98e06b2708aeaedaaa (patch) | |
tree | edd7c64088138e13f23629a262b330f60ba606b2 /drivers/staging/comedi | |
parent | d7bd1cd1478d7eb7dd21f330acb9419178edbdb3 (diff) | |
download | linux-fsl-qoriq-db0eaeed6493fed37382fc98e06b2708aeaedaaa.tar.xz |
staging: comedi: refactor adl_pci7296 driver to remove forward declarations
Move the struct comedi_driver variable and the associated
attach/detach routines to remove the need for the forward
declarations.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/adl_pci7296.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c index bd18865..2bd749b 100644 --- a/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/drivers/staging/comedi/drivers/adl_pci7296.c @@ -48,13 +48,6 @@ Configuration Options: #define PCI_DEVICE_ID_PCI7296 0x7296 -static DEFINE_PCI_DEVICE_TABLE(adl_pci7296_pci_table) = { - { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296) }, - {0} -}; - -MODULE_DEVICE_TABLE(pci, adl_pci7296_pci_table); - struct adl_pci7296_private { int data; struct pci_dev *pci_dev; @@ -63,16 +56,6 @@ struct adl_pci7296_private { #define devpriv ((struct adl_pci7296_private *)dev->private) static int adl_pci7296_attach(struct comedi_device *dev, - struct comedi_devconfig *it); -static int adl_pci7296_detach(struct comedi_device *dev); -static struct comedi_driver driver_adl_pci7296 = { - .driver_name = "adl_pci7296", - .module = THIS_MODULE, - .attach = adl_pci7296_attach, - .detach = adl_pci7296_detach, -}; - -static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct pci_dev *pcidev = NULL; @@ -172,6 +155,13 @@ static int adl_pci7296_detach(struct comedi_device *dev) return 0; } +static struct comedi_driver driver_adl_pci7296 = { + .driver_name = "adl_pci7296", + .module = THIS_MODULE, + .attach = adl_pci7296_attach, + .detach = adl_pci7296_detach, +}; + static int __devinit driver_adl_pci7296_pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) @@ -184,10 +174,16 @@ static void __devexit driver_adl_pci7296_pci_remove(struct pci_dev *dev) comedi_pci_auto_unconfig(dev); } +static DEFINE_PCI_DEVICE_TABLE(adl_pci7296_pci_table) = { + { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296) }, + {0} +}; +MODULE_DEVICE_TABLE(pci, adl_pci7296_pci_table); + static struct pci_driver driver_adl_pci7296_pci_driver = { - .id_table = adl_pci7296_pci_table, - .probe = &driver_adl_pci7296_pci_probe, - .remove = __devexit_p(&driver_adl_pci7296_pci_remove) + .id_table = adl_pci7296_pci_table, + .probe = driver_adl_pci7296_pci_probe, + .remove = __devexit_p(driver_adl_pci7296_pci_remove) }; static int __init driver_adl_pci7296_init_module(void) @@ -202,14 +198,13 @@ static int __init driver_adl_pci7296_init_module(void) (char *)driver_adl_pci7296.driver_name; return pci_register_driver(&driver_adl_pci7296_pci_driver); } +module_init(driver_adl_pci7296_init_module); static void __exit driver_adl_pci7296_cleanup_module(void) { pci_unregister_driver(&driver_adl_pci7296_pci_driver); comedi_driver_unregister(&driver_adl_pci7296); } - -module_init(driver_adl_pci7296_init_module); module_exit(driver_adl_pci7296_cleanup_module); MODULE_AUTHOR("Comedi http://www.comedi.org"); |