Skip to content

Commit

Permalink
staging: comedi: skel: use module_comedi_pci_driver()
Browse files Browse the repository at this point in the history
Use the `module_comedi_pci_driver()` macro to register the module as a
comedi PCI driver instead of adding the boiler-plate code in full.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent 6bdc31d commit b61b2b1
Showing 1 changed file with 1 addition and 21 deletions.
22 changes: 1 addition & 21 deletions drivers/staging/comedi/drivers/skel.c
Original file line number Diff line number Diff line change
Expand Up @@ -598,27 +598,7 @@ static struct pci_driver skel_pci_driver = {
.probe = &skel_pci_probe,
.remove = __devexit_p(&skel_pci_remove)
};

static int __init skel_init_module(void)
{
int retval;

retval = comedi_driver_register(&skel_driver);
if (retval < 0)
return retval;

skel_pci_driver.name = (char *)skel_driver.driver_name;
return pci_register_driver(&skel_pci_driver);
}

static void __exit skel_cleanup_module(void)
{
pci_unregister_driver(&skel_pci_driver);
comedi_driver_unregister(&skel_driver);
}

module_init(skel_init_module);
module_exit(skel_cleanup_module);
module_comedi_pci_driver(skel_driver, skel_pci_driver);
#else
module_comedi_driver(skel_driver);
#endif
Expand Down

0 comments on commit b61b2b1

Please sign in to comment.