Skip to content

L
linux
Commit f1decb9b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: refactor ssv_dnp 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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40e7f510
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 140 deletions
drivers/staging/comedi/drivers/ssv_dnp.c
View file @ f1decb9b
......@@ -59,16 +59,6 @@ struct dnp_board {
int have_dio;
};
/* We only support one DNP 'board' variant at the moment */
static const struct dnp_board dnp_boards[] = {
{
.name = "dnp-1486",
.ai_chans = 16,
.ai_bits = 12,
.have_dio = 1,
},
};
/* Useful for shorthand access to the particular board structure ----------- */
#define thisboard ((const struct dnp_board *)dev->board_ptr)
......@@ -80,136 +70,6 @@ struct dnp_private_data {
/* Shorthand macro for faster access to the private data ------------------- */
#define devpriv ((dnp_private *)dev->private)
/* ------------------------------------------------------------------------- */
/* The struct comedi_driver structure tells the Comedi core module which */
/* functions to call to configure/deconfigure (attach/detach) the board, and */
/* also about the kernel module that contains the device code. */
/* */
/* In the following section we define the API of this driver. */
/* ------------------------------------------------------------------------- */
static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static int dnp_detach(struct comedi_device *dev);
static struct comedi_driver driver_dnp = {
.driver_name = "ssv_dnp",
.module = THIS_MODULE,
.attach = dnp_attach,
.detach = dnp_detach,
.board_name = &dnp_boards[0].name,
/* only necessary for non-PnP devs */
.offset = sizeof(struct dnp_board), /* like ISA-PnP, PCI or PCMCIA */
.num_names = ARRAY_SIZE(dnp_boards),
};
static int __init driver_dnp_init_module(void)
{
return comedi_driver_register(&driver_dnp);
}
static void __exit driver_dnp_cleanup_module(void)
{
comedi_driver_unregister(&driver_dnp);
}
module_init(driver_dnp_init_module);
module_exit(driver_dnp_cleanup_module);
static int dnp_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
static int dnp_dio_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
/* ------------------------------------------------------------------------- */
/* Attach is called by comedi core to configure the driver for a particular */
/* board. If you specified a board_name array in the driver structure, */
/* dev->board_ptr contains that address. */
/* ------------------------------------------------------------------------- */
static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct comedi_subdevice *s;
printk(KERN_INFO "comedi%d: dnp: ", dev->minor);
/* Autoprobing: this should find out which board we have. Currently */
/* only the 1486 board is supported and autoprobing is not */
/* implemented :-) */
/* dev->board_ptr = dnp_probe(dev); */
/* Initialize the name of the board. */
/* We can use the "thisboard" macro now. */
dev->board_name = thisboard->name;
/* Allocate the private structure area. alloc_private() is a */
/* convenient macro defined in comedidev.h. */
if (alloc_private(dev, sizeof(struct dnp_private_data)) < 0)
return -ENOMEM;
/* Allocate the subdevice structures. alloc_subdevice() is a */
/* convenient macro defined in comedidev.h. */
if (alloc_subdevices(dev, 1) < 0)
return -ENOMEM;
s = dev->subdevices + 0;
/* digital i/o subdevice */
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 20;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_bits = dnp_dio_insn_bits;
s->insn_config = dnp_dio_insn_config;
printk("attached\n");
/* We use the I/O ports 0x22,0x23 and 0xa3-0xa9, which are always
* allocated for the primary 8259, so we don't need to allocate them
* ourselves. */
/* configure all ports as input (default) */
outb(PAMR, CSCIR);
outb(0x00, CSCDR);
outb(PBMR, CSCIR);
outb(0x00, CSCDR);
outb(PCMR, CSCIR);
outb((inb(CSCDR) & 0xAA), CSCDR);
return 1;
}
/* ------------------------------------------------------------------------- */
/* detach is called to deconfigure a device. It should deallocate the */
/* resources. This function is also called when _attach() fails, so it */
/* should be careful not to release resources that were not necessarily */
/* allocated by _attach(). dev->private and dev->subdevices are */
/* deallocated automatically by the core. */
/* ------------------------------------------------------------------------- */
static int dnp_detach(struct comedi_device *dev)
{
/* configure all ports as input (default) */
outb(PAMR, CSCIR);
outb(0x00, CSCDR);
outb(PBMR, CSCIR);
outb(0x00, CSCDR);
outb(PCMR, CSCIR);
outb((inb(CSCDR) & 0xAA), CSCDR);
/* announce that we are finished */
printk(KERN_INFO "comedi%d: dnp: remove\n", dev->minor);
return 0;
}
/* ------------------------------------------------------------------------- */
/* The insn_bits interface allows packed reading/writing of DIO channels. */
/* The comedi core can convert between insn_bits and insn_read/write, so you */
......@@ -326,6 +186,95 @@ static int dnp_dio_insn_config(struct comedi_device *dev,
}
static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct comedi_subdevice *s;
printk(KERN_INFO "comedi%d: dnp: ", dev->minor);
/* Autoprobing: this should find out which board we have. Currently */
/* only the 1486 board is supported and autoprobing is not */
/* implemented :-) */
/* dev->board_ptr = dnp_probe(dev); */
/* Initialize the name of the board. */
/* We can use the "thisboard" macro now. */
dev->board_name = thisboard->name;
/* Allocate the private structure area. alloc_private() is a */
/* convenient macro defined in comedidev.h. */
if (alloc_private(dev, sizeof(struct dnp_private_data)) < 0)
return -ENOMEM;
/* Allocate the subdevice structures. alloc_subdevice() is a */
/* convenient macro defined in comedidev.h. */
if (alloc_subdevices(dev, 1) < 0)
return -ENOMEM;
s = dev->subdevices + 0;
/* digital i/o subdevice */
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 20;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_bits = dnp_dio_insn_bits;
s->insn_config = dnp_dio_insn_config;
printk("attached\n");
/* We use the I/O ports 0x22,0x23 and 0xa3-0xa9, which are always
* allocated for the primary 8259, so we don't need to allocate them
* ourselves. */
/* configure all ports as input (default) */
outb(PAMR, CSCIR);
outb(0x00, CSCDR);
outb(PBMR, CSCIR);
outb(0x00, CSCDR);
outb(PCMR, CSCIR);
outb((inb(CSCDR) & 0xAA), CSCDR);
return 1;
}
static int dnp_detach(struct comedi_device *dev)
{
/* configure all ports as input (default) */
outb(PAMR, CSCIR);
outb(0x00, CSCDR);
outb(PBMR, CSCIR);
outb(0x00, CSCDR);
outb(PCMR, CSCIR);
outb((inb(CSCDR) & 0xAA), CSCDR);
/* announce that we are finished */
printk(KERN_INFO "comedi%d: dnp: remove\n", dev->minor);
return 0;
}
static const struct dnp_board dnp_boards[] = {
{
.name = "dnp-1486",
.ai_chans = 16,
.ai_bits = 12,
.have_dio = 1,
},
};
static struct comedi_driver dnp_driver = {
.driver_name = "ssv_dnp",
.module = THIS_MODULE,
.attach = dnp_attach,
.detach = dnp_detach,
.board_name = &dnp_boards[0].name,
.offset = sizeof(struct dnp_board),
.num_names = ARRAY_SIZE(dnp_boards),
};
module_comedi_driver(dnp_driver);
MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
MODULE_LICENSE("GPL");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7