mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 14:40:12 -04:00
staging: comedi: refactor pcl724 driver to remove the forward declarations
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. 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:
committed by
Greg Kroah-Hartman
parent
8dbf14605d
commit
ccc66e0a06
@@ -56,10 +56,6 @@ See the source for configuration details.
|
||||
|
||||
/* #define PCL724_IRQ 1 no IRQ support now */
|
||||
|
||||
static int pcl724_attach(struct comedi_device *dev,
|
||||
struct comedi_devconfig *it);
|
||||
static int pcl724_detach(struct comedi_device *dev);
|
||||
|
||||
struct pcl724_board {
|
||||
|
||||
const char *name; /* board name */
|
||||
@@ -71,40 +67,8 @@ struct pcl724_board {
|
||||
char is_pet48;
|
||||
};
|
||||
|
||||
static const struct pcl724_board boardtypes[] = {
|
||||
{"pcl724", 24, 1, 0x00fc, PCL724_SIZE, 0, 0,},
|
||||
{"pcl722", 144, 6, 0x00fc, PCL722_SIZE, 1, 0,},
|
||||
{"pcl731", 48, 2, 0x9cfc, PCL731_SIZE, 0, 0,},
|
||||
{"acl7122", 144, 6, 0x9ee8, PCL722_SIZE, 1, 0,},
|
||||
{"acl7124", 24, 1, 0x00fc, PCL724_SIZE, 0, 0,},
|
||||
{"pet48dio", 48, 2, 0x9eb8, PET48_SIZE, 0, 1,},
|
||||
};
|
||||
|
||||
#define this_board ((const struct pcl724_board *)dev->board_ptr)
|
||||
|
||||
static struct comedi_driver driver_pcl724 = {
|
||||
.driver_name = "pcl724",
|
||||
.module = THIS_MODULE,
|
||||
.attach = pcl724_attach,
|
||||
.detach = pcl724_detach,
|
||||
.board_name = &boardtypes[0].name,
|
||||
.num_names = ARRAY_SIZE(boardtypes),
|
||||
.offset = sizeof(struct pcl724_board),
|
||||
};
|
||||
|
||||
static int __init driver_pcl724_init_module(void)
|
||||
{
|
||||
return comedi_driver_register(&driver_pcl724);
|
||||
}
|
||||
|
||||
static void __exit driver_pcl724_cleanup_module(void)
|
||||
{
|
||||
comedi_driver_unregister(&driver_pcl724);
|
||||
}
|
||||
|
||||
module_init(driver_pcl724_init_module);
|
||||
module_exit(driver_pcl724_cleanup_module);
|
||||
|
||||
static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
|
||||
{
|
||||
unsigned long iobase = arg;
|
||||
@@ -232,6 +196,37 @@ static int pcl724_detach(struct comedi_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct pcl724_board boardtypes[] = {
|
||||
{ "pcl724", 24, 1, 0x00fc, PCL724_SIZE, 0, 0, },
|
||||
{ "pcl722", 144, 6, 0x00fc, PCL722_SIZE, 1, 0, },
|
||||
{ "pcl731", 48, 2, 0x9cfc, PCL731_SIZE, 0, 0, },
|
||||
{ "acl7122", 144, 6, 0x9ee8, PCL722_SIZE, 1, 0, },
|
||||
{ "acl7124", 24, 1, 0x00fc, PCL724_SIZE, 0, 0, },
|
||||
{ "pet48dio", 48, 2, 0x9eb8, PET48_SIZE, 0, 1, },
|
||||
};
|
||||
|
||||
static struct comedi_driver driver_pcl724 = {
|
||||
.driver_name = "pcl724",
|
||||
.module = THIS_MODULE,
|
||||
.attach = pcl724_attach,
|
||||
.detach = pcl724_detach,
|
||||
.board_name = &boardtypes[0].name,
|
||||
.num_names = ARRAY_SIZE(boardtypes),
|
||||
.offset = sizeof(struct pcl724_board),
|
||||
};
|
||||
|
||||
static int __init driver_pcl724_init_module(void)
|
||||
{
|
||||
return comedi_driver_register(&driver_pcl724);
|
||||
}
|
||||
module_init(driver_pcl724_init_module);
|
||||
|
||||
static void __exit driver_pcl724_cleanup_module(void)
|
||||
{
|
||||
comedi_driver_unregister(&driver_pcl724);
|
||||
}
|
||||
module_exit(driver_pcl724_cleanup_module);
|
||||
|
||||
MODULE_AUTHOR("Comedi http://www.comedi.org");
|
||||
MODULE_DESCRIPTION("Comedi low-level driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
Reference in New Issue
Block a user