Skip to content

Commit

Permalink
staging: comedi: refactor fl512 driver to remove forward declarations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent 236788f commit a39eb90
Showing 1 changed file with 19 additions and 35 deletions.
54 changes: 19 additions & 35 deletions drivers/staging/comedi/drivers/fl512.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,38 +42,6 @@ static const struct comedi_lrange range_fl512 = { 4, {
}
};

static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static int fl512_detach(struct comedi_device *dev);

static struct comedi_driver driver_fl512 = {
.driver_name = "fl512",
.module = THIS_MODULE,
.attach = fl512_attach,
.detach = fl512_detach,
};

static int __init driver_fl512_init_module(void)
{
return comedi_driver_register(&driver_fl512);
}

static void __exit driver_fl512_cleanup_module(void)
{
comedi_driver_unregister(&driver_fl512);
}

module_init(driver_fl512_init_module);
module_exit(driver_fl512_cleanup_module);

static int fl512_ai_insn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data);
static int fl512_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);
static int fl512_ao_insn_readback(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data);

/*
* fl512_ai_insn : this is the analog input function
*/
Expand Down Expand Up @@ -140,9 +108,6 @@ static int fl512_ao_insn_readback(struct comedi_device *dev,
return n;
}

/*
* start attach
*/
static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
unsigned long iobase;
Expand Down Expand Up @@ -217,6 +182,25 @@ static int fl512_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_fl512 = {
.driver_name = "fl512",
.module = THIS_MODULE,
.attach = fl512_attach,
.detach = fl512_detach,
};

static int __init driver_fl512_init_module(void)
{
return comedi_driver_register(&driver_fl512);
}
module_init(driver_fl512_init_module);

static void __exit driver_fl512_cleanup_module(void)
{
comedi_driver_unregister(&driver_fl512);
}
module_exit(driver_fl512_cleanup_module);

MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
MODULE_LICENSE("GPL");

0 comments on commit a39eb90

Please sign in to comment.