Skip to content

Commit

Permalink
staging: comedi: refactor pcm3730 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 5f01bd5 commit f3ebaf4
Showing 1 changed file with 19 additions and 23 deletions.
42 changes: 19 additions & 23 deletions drivers/staging/comedi/drivers/pcm3730.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,6 @@ Configuration options:
#define PCM3730_DIB 2
#define PCM3730_DIC 3

static int pcm3730_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static int pcm3730_detach(struct comedi_device *dev);
static struct comedi_driver driver_pcm3730 = {
.driver_name = "pcm3730",
.module = THIS_MODULE,
.attach = pcm3730_attach,
.detach = pcm3730_detach,
};

static int __init driver_pcm3730_init_module(void)
{
return comedi_driver_register(&driver_pcm3730);
}

static void __exit driver_pcm3730_cleanup_module(void)
{
comedi_driver_unregister(&driver_pcm3730);
}

module_init(driver_pcm3730_init_module);
module_exit(driver_pcm3730_cleanup_module);

static int pcm3730_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand Down Expand Up @@ -166,6 +143,25 @@ static int pcm3730_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_pcm3730 = {
.driver_name = "pcm3730",
.module = THIS_MODULE,
.attach = pcm3730_attach,
.detach = pcm3730_detach,
};

static int __init driver_pcm3730_init_module(void)
{
return comedi_driver_register(&driver_pcm3730);
}
module_init(driver_pcm3730_init_module);

static void __exit driver_pcm3730_cleanup_module(void)
{
comedi_driver_unregister(&driver_pcm3730);
}
module_exit(driver_pcm3730_cleanup_module);

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

0 comments on commit f3ebaf4

Please sign in to comment.