Skip to content

Commit

Permalink
staging: comedi: refactor pcl726 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 f21a38c commit 2bc62b6
Showing 1 changed file with 22 additions and 27 deletions.
49 changes: 22 additions & 27 deletions drivers/staging/comedi/drivers/pcl726.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ static const struct comedi_lrange *const rangelist_728[] = {
&range_4_20mA, &range_0_20mA
};

static int pcl726_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static int pcl726_detach(struct comedi_device *dev);

struct pcl726_board {

const char *name; /* driver name */
Expand Down Expand Up @@ -151,29 +147,6 @@ static const struct pcl726_board boardtypes[] = {

#define this_board ((const struct pcl726_board *)dev->board_ptr)

static struct comedi_driver driver_pcl726 = {
.driver_name = "pcl726",
.module = THIS_MODULE,
.attach = pcl726_attach,
.detach = pcl726_detach,
.board_name = &boardtypes[0].name,
.num_names = ARRAY_SIZE(boardtypes),
.offset = sizeof(struct pcl726_board),
};

static int __init driver_pcl726_init_module(void)
{
return comedi_driver_register(&driver_pcl726);
}

static void __exit driver_pcl726_cleanup_module(void)
{
comedi_driver_unregister(&driver_pcl726);
}

module_init(driver_pcl726_init_module);
module_exit(driver_pcl726_cleanup_module);

struct pcl726_private {

int bipolar[12];
Expand Down Expand Up @@ -392,6 +365,28 @@ static int pcl726_detach(struct comedi_device *dev)
return 0;
}

static struct comedi_driver driver_pcl726 = {
.driver_name = "pcl726",
.module = THIS_MODULE,
.attach = pcl726_attach,
.detach = pcl726_detach,
.board_name = &boardtypes[0].name,
.num_names = ARRAY_SIZE(boardtypes),
.offset = sizeof(struct pcl726_board),
};

static int __init driver_pcl726_init_module(void)
{
return comedi_driver_register(&driver_pcl726);
}
module_init(driver_pcl726_init_module);

static void __exit driver_pcl726_cleanup_module(void)
{
comedi_driver_unregister(&driver_pcl726);
}
module_exit(driver_pcl726_cleanup_module);

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

0 comments on commit 2bc62b6

Please sign in to comment.