Commit 5f01bd51 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: refactor pcm3724 driver to remove 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: 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 f6aafa10
......@@ -62,10 +62,6 @@ Copy/pasted/hacked from pcm724.c
#define CR_A_MODE(a) ((a)<<5)
#define CR_CW 0x80
static int pcm3724_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static int pcm3724_detach(struct comedi_device *dev);
struct pcm3724_board {
const char *name; /* driver name */
int dio; /* num of DIO */
......@@ -80,35 +76,8 @@ struct priv_pcm3724 {
int dio_2;
};
static const struct pcm3724_board boardtypes[] = {
{"pcm3724", 48, 2, 0x00fc, PCM3724_SIZE,},
};
#define this_board ((const struct pcm3724_board *)dev->board_ptr)
static struct comedi_driver driver_pcm3724 = {
.driver_name = "pcm3724",
.module = THIS_MODULE,
.attach = pcm3724_attach,
.detach = pcm3724_detach,
.board_name = &boardtypes[0].name,
.num_names = ARRAY_SIZE(boardtypes),
.offset = sizeof(struct pcm3724_board),
};
static int __init driver_pcm3724_init_module(void)
{
return comedi_driver_register(&driver_pcm3724);
}
static void __exit driver_pcm3724_cleanup_module(void)
{
comedi_driver_unregister(&driver_pcm3724);
}
module_init(driver_pcm3724_init_module);
module_exit(driver_pcm3724_cleanup_module);
/* (setq c-basic-offset 8) */
static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
......@@ -318,6 +287,32 @@ static int pcm3724_detach(struct comedi_device *dev)
return 0;
}
static const struct pcm3724_board boardtypes[] = {
{ "pcm3724", 48, 2, 0x00fc, PCM3724_SIZE, },
};
static struct comedi_driver driver_pcm3724 = {
.driver_name = "pcm3724",
.module = THIS_MODULE,
.attach = pcm3724_attach,
.detach = pcm3724_detach,
.board_name = &boardtypes[0].name,
.num_names = ARRAY_SIZE(boardtypes),
.offset = sizeof(struct pcm3724_board),
};
static int __init driver_pcm3724_init_module(void)
{
return comedi_driver_register(&driver_pcm3724);
}
module_init(driver_pcm3724_init_module);
static void __exit driver_pcm3724_cleanup_module(void)
{
comedi_driver_unregister(&driver_pcm3724);
}
module_exit(driver_pcm3724_cleanup_module);
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