Skip to content

Commit

Permalink
staging: comedi: Use module_comedi_pci_driver and standardize drivers
Browse files Browse the repository at this point in the history 
Convert the refactored comedi pci drivers to use the
module_comedi_pci_driver() macro which makes the code
smaller and a bit simpler.

In the process, rename some of the symbols in the driver
to standardize the comedi pci drivers.

Based on the driver {name}:
1) Rename the comedi_driver to {name}_driver.
2) Use a static string {name} for the comedi_driver.driver_name.
3) Rename the pci probe/remove functions to {name)_pci_probe/remove.
4) Rename the pci id_table to {name}_pci_table.
5) Add the static string {name} for the pci_driver.name.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed May 14, 2012
1 parent d4899c6 commit 75e6301
Show file tree
Hide file tree
Showing 15 changed files with 174 additions and 455 deletions.
50 changes: 15 additions & 35 deletions drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ Configuration Options:
#include "../comedidev.h"
#include "comedi_pci.h"

#define PCI6208_DRIVER_NAME "adl_pci6208"

/* Board descriptions */
struct pci6208_board {
const char *name;
Expand Down Expand Up @@ -248,7 +246,7 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr,
unsigned long io_base, io_range, lcr_io_base, lcr_io_range;

/* Enable PCI device and request regions */
if (comedi_pci_enable(pci_dev, PCI6208_DRIVER_NAME) < 0) {
if (comedi_pci_enable(pci_dev, "adl_pci6208") < 0) {
printk(KERN_ERR "comedi%d: Failed to enable PCI device "
"and request regions\n",
dev_minor);
Expand Down Expand Up @@ -345,59 +343,41 @@ static int pci6208_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_pci6208 = {
.driver_name = PCI6208_DRIVER_NAME,
static struct comedi_driver adl_pci6208_driver = {
.driver_name = "adl_pci6208",
.module = THIS_MODULE,
.attach = pci6208_attach,
.detach = pci6208_detach,
};

static int __devinit driver_pci6208_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
static int __devinit adl_pci6208_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, &driver_pci6208);
return comedi_pci_auto_config(dev, &adl_pci6208_driver);
}

static void __devexit driver_pci6208_pci_remove(struct pci_dev *dev)
static void __devexit adl_pci6208_pci_remove(struct pci_dev *dev)
{
comedi_pci_auto_unconfig(dev);
}

/* This is used by modprobe to translate PCI IDs to drivers. Should
* only be used for PCI and ISA-PnP devices */
static DEFINE_PCI_DEVICE_TABLE(pci6208_pci_table) = {
static DEFINE_PCI_DEVICE_TABLE(adl_pci6208_pci_table) = {
/* { PCI_VENDOR_ID_ADLINK, 0x6208, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, */
/* { PCI_VENDOR_ID_ADLINK, 0x6208, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, */
{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x6208) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, pci6208_pci_table);
MODULE_DEVICE_TABLE(pci, adl_pci6208_pci_table);

static struct pci_driver driver_pci6208_pci_driver = {
.id_table = pci6208_pci_table,
.probe = driver_pci6208_pci_probe,
.remove = __devexit_p(driver_pci6208_pci_remove),
static struct pci_driver adl_pci6208_pci_driver = {
.name = "adl_pci6208",
.id_table = adl_pci6208_pci_table,
.probe = adl_pci6208_pci_probe,
.remove = __devexit_p(adl_pci6208_pci_remove),
};

static int __init driver_pci6208_init_module(void)
{
int retval;

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

driver_pci6208_pci_driver.name = (char *)driver_pci6208.driver_name;
return pci_register_driver(&driver_pci6208_pci_driver);
}
module_init(driver_pci6208_init_module);

static void __exit driver_pci6208_cleanup_module(void)
{
pci_unregister_driver(&driver_pci6208_pci_driver);
comedi_driver_unregister(&driver_pci6208);
}
module_exit(driver_pci6208_cleanup_module);
module_comedi_pci_driver(adl_pci6208_driver, adl_pci6208_pci_driver);

MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
Expand Down
42 changes: 11 additions & 31 deletions drivers/staging/comedi/drivers/adl_pci7230.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,57 +163,37 @@ static int adl_pci7230_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_adl_pci7230 = {
static struct comedi_driver adl_pci7230_driver = {
.driver_name = "adl_pci7230",
.module = THIS_MODULE,
.attach = adl_pci7230_attach,
.detach = adl_pci7230_detach,
};

static int __devinit driver_adl_pci7230_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
static int __devinit adl_pci7230_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, &driver_adl_pci7230);
return comedi_pci_auto_config(dev, &adl_pci7230_driver);
}

static void __devexit driver_adl_pci7230_pci_remove(struct pci_dev *dev)
static void __devexit adl_pci7230_pci_remove(struct pci_dev *dev)
{
comedi_pci_auto_unconfig(dev);
}

static DEFINE_PCI_DEVICE_TABLE(adl_pci7230_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7230) },
{0}
{ 0 }
};
MODULE_DEVICE_TABLE(pci, adl_pci7230_pci_table);

static struct pci_driver driver_adl_pci7230_pci_driver = {
static struct pci_driver adl_pci7230_pci_driver = {
.name = "adl_pci7230",
.id_table = adl_pci7230_pci_table,
.probe = driver_adl_pci7230_pci_probe,
.remove = __devexit_p(driver_adl_pci7230_pci_remove)
.probe = adl_pci7230_pci_probe,
.remove = __devexit_p(adl_pci7230_pci_remove),
};

static int __init driver_adl_pci7230_init_module(void)
{
int retval;

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

driver_adl_pci7230_pci_driver.name =
(char *)driver_adl_pci7230.driver_name;
return pci_register_driver(&driver_adl_pci7230_pci_driver);
}
module_init(driver_adl_pci7230_init_module);

static void __exit driver_adl_pci7230_cleanup_module(void)
{
pci_unregister_driver(&driver_adl_pci7230_pci_driver);
comedi_driver_unregister(&driver_adl_pci7230);
}
module_exit(driver_adl_pci7230_cleanup_module);
module_comedi_pci_driver(adl_pci7230_driver, adl_pci7230_pci_driver);

MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
Expand Down
42 changes: 11 additions & 31 deletions drivers/staging/comedi/drivers/adl_pci7296.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,57 +155,37 @@ static int adl_pci7296_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_adl_pci7296 = {
static struct comedi_driver adl_pci7296_driver = {
.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)
static int __devinit adl_pci7296_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, &driver_adl_pci7296);
return comedi_pci_auto_config(dev, &adl_pci7296_driver);
}

static void __devexit driver_adl_pci7296_pci_remove(struct pci_dev *dev)
static void __devexit 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}
{ 0 }
};
MODULE_DEVICE_TABLE(pci, adl_pci7296_pci_table);

static struct pci_driver driver_adl_pci7296_pci_driver = {
static struct pci_driver adl_pci7296_pci_driver = {
.name = "adl_pci7296",
.id_table = adl_pci7296_pci_table,
.probe = driver_adl_pci7296_pci_probe,
.remove = __devexit_p(driver_adl_pci7296_pci_remove)
.probe = adl_pci7296_pci_probe,
.remove = __devexit_p(adl_pci7296_pci_remove),
};

static int __init driver_adl_pci7296_init_module(void)
{
int retval;

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

driver_adl_pci7296_pci_driver.name =
(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_exit(driver_adl_pci7296_cleanup_module);
module_comedi_pci_driver(adl_pci7296_driver, adl_pci7296_pci_driver);

MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
Expand Down
42 changes: 11 additions & 31 deletions drivers/staging/comedi/drivers/adl_pci7432.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,57 +174,37 @@ static int adl_pci7432_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_adl_pci7432 = {
static struct comedi_driver adl_pci7432_driver = {
.driver_name = "adl_pci7432",
.module = THIS_MODULE,
.attach = adl_pci7432_attach,
.detach = adl_pci7432_detach,
};

static int __devinit driver_adl_pci7432_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
static int __devinit adl_pci7432_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, &driver_adl_pci7432);
return comedi_pci_auto_config(dev, &adl_pci7432_driver);
}

static void __devexit driver_adl_pci7432_pci_remove(struct pci_dev *dev)
static void __devexit adl_pci7432_pci_remove(struct pci_dev *dev)
{
comedi_pci_auto_unconfig(dev);
}

static DEFINE_PCI_DEVICE_TABLE(adl_pci7432_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432) },
{0}
{ 0 }
};
MODULE_DEVICE_TABLE(pci, adl_pci7432_pci_table);

static struct pci_driver driver_adl_pci7432_pci_driver = {
static struct pci_driver adl_pci7432_pci_driver = {
.name = "adl_pci7432",
.id_table = adl_pci7432_pci_table,
.probe = driver_adl_pci7432_pci_probe,
.remove = __devexit_p(driver_adl_pci7432_pci_remove)
.probe = adl_pci7432_pci_probe,
.remove = __devexit_p(adl_pci7432_pci_remove),
};

static int __init driver_adl_pci7432_init_module(void)
{
int retval;

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

driver_adl_pci7432_pci_driver.name =
(char *)driver_adl_pci7432.driver_name;
return pci_register_driver(&driver_adl_pci7432_pci_driver);
}
module_init(driver_adl_pci7432_init_module);

static void __exit driver_adl_pci7432_cleanup_module(void)
{
pci_unregister_driver(&driver_adl_pci7432_pci_driver);
comedi_driver_unregister(&driver_adl_pci7432);
}
module_exit(driver_adl_pci7432_cleanup_module);
module_comedi_pci_driver(adl_pci7432_driver, adl_pci7432_pci_driver);

MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
Expand Down
40 changes: 10 additions & 30 deletions drivers/staging/comedi/drivers/adl_pci8164.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,21 +327,20 @@ static int adl_pci8164_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_adl_pci8164 = {
static struct comedi_driver adl_pci8164_driver = {
.driver_name = "adl_pci8164",
.module = THIS_MODULE,
.attach = adl_pci8164_attach,
.detach = adl_pci8164_detach,
};

static int __devinit driver_adl_pci8164_pci_probe(struct pci_dev *dev,
const struct pci_device_id
*ent)
static int __devinit adl_pci8164_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
return comedi_pci_auto_config(dev, &driver_adl_pci8164);
return comedi_pci_auto_config(dev, &adl_pci8164_driver);
}

static void __devexit driver_adl_pci8164_pci_remove(struct pci_dev *dev)
static void __devexit adl_pci8164_pci_remove(struct pci_dev *dev)
{
comedi_pci_auto_unconfig(dev);
}
Expand All @@ -352,32 +351,13 @@ static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = {
};
MODULE_DEVICE_TABLE(pci, adl_pci8164_pci_table);

static struct pci_driver driver_adl_pci8164_pci_driver = {
static struct pci_driver adl_pci8164_pci_driver = {
.name = "adl_pci8164",
.id_table = adl_pci8164_pci_table,
.probe = driver_adl_pci8164_pci_probe,
.remove = __devexit_p(driver_adl_pci8164_pci_remove),
.probe = adl_pci8164_pci_probe,
.remove = __devexit_p(adl_pci8164_pci_remove),
};

static int __init driver_adl_pci8164_init_module(void)
{
int retval;

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

driver_adl_pci8164_pci_driver.name =
(char *)driver_adl_pci8164.driver_name;
return pci_register_driver(&driver_adl_pci8164_pci_driver);
}
module_init(driver_adl_pci8164_init_module);

static void __exit driver_adl_pci8164_cleanup_module(void)
{
pci_unregister_driver(&driver_adl_pci8164_pci_driver);
comedi_driver_unregister(&driver_adl_pci8164);
}
module_exit(driver_adl_pci8164_cleanup_module);
module_comedi_pci_driver(adl_pci8164_driver, adl_pci8164_pci_driver);

MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
Expand Down
Loading

0 comments on commit 75e6301

Please sign in to comment.