OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: refactor mpc8260cpm driver and use module_comedi_driver 

Move the module_init/module_exit routines and the associated
struct comedi_driver and other variables to the end of the source.
This is more typical of how other drivers are written and removes
the need for the forward declarations.

Convert the driver to use the module_comedi_driver() macro which
makes the code smaller and a bit simpler.

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>
This commit is contained in:
H Hartley Sweeten 2012-05-04 15:26:44 -07:00 committed by Greg Kroah-Hartman
parent d573d6bd30
commit 45d63679d8
1 changed files with 47 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
drivers/staging/comedi/drivers/mpc8260cpm.c
View File

@ -46,75 +46,6 @@ struct mpc8260cpm_private {
#define devpriv ((struct mpc8260cpm_private *)dev->private)
static int mpc8260cpm_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static int mpc8260cpm_detach(struct comedi_device *dev);
static struct comedi_driver driver_mpc8260cpm = {
.driver_name = "mpc8260cpm",
.module = THIS_MODULE,
.attach = mpc8260cpm_attach,
.detach = mpc8260cpm_detach,
};
static int __init driver_mpc8260cpm_init_module(void)
{
return comedi_driver_register(&driver_mpc8260cpm);
}
static void __exit driver_mpc8260cpm_cleanup_module(void)
{
comedi_driver_unregister(&driver_mpc8260cpm);
}
module_init(driver_mpc8260cpm_init_module);
module_exit(driver_mpc8260cpm_cleanup_module);
static int mpc8260cpm_dio_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
static int mpc8260cpm_dio_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
static int mpc8260cpm_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
struct comedi_subdevice *s;
int i;
printk("comedi%d: mpc8260cpm: ", dev->minor);
dev->board_ptr = mpc8260cpm_boards + dev->board;
dev->board_name = thisboard->name;
if (alloc_private(dev, sizeof(struct mpc8260cpm_private)) < 0)
return -ENOMEM;
if (alloc_subdevices(dev, 4) < 0)
return -ENOMEM;
for (i = 0; i < 4; i++) {
s = dev->subdevices + i;
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 32;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_config = mpc8260cpm_dio_config;
s->insn_bits = mpc8260cpm_dio_bits;
}
return 1;
}
static int mpc8260cpm_detach(struct comedi_device *dev)
{
printk("comedi%d: mpc8260cpm: remove\n", dev->minor);
return 0;
}
static unsigned long *cpm_pdat(int port)
{
switch (port) {
@ -184,3 +115,50 @@ static int mpc8260cpm_dio_bits(struct comedi_device *dev,
return 2;
}
static int mpc8260cpm_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
struct comedi_subdevice *s;
int i;
printk("comedi%d: mpc8260cpm: ", dev->minor);
dev->board_ptr = mpc8260cpm_boards + dev->board;
dev->board_name = thisboard->name;
if (alloc_private(dev, sizeof(struct mpc8260cpm_private)) < 0)
return -ENOMEM;
if (alloc_subdevices(dev, 4) < 0)
return -ENOMEM;
for (i = 0; i < 4; i++) {
s = dev->subdevices + i;
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 32;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_config = mpc8260cpm_dio_config;
s->insn_bits = mpc8260cpm_dio_bits;
}
return 1;
}
static int mpc8260cpm_detach(struct comedi_device *dev)
{
printk("comedi%d: mpc8260cpm: remove\n", dev->minor);
return 0;
}
static struct comedi_driver mpc8260cpm_driver = {
.driver_name = "mpc8260cpm",
.module = THIS_MODULE,
.attach = mpc8260cpm_attach,
.detach = mpc8260cpm_detach,
};
module_comedi_driver(mpc8260cpm_driver);