diff options
| author | H Hartley Sweeten | 2013-01-26 02:37:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-30 05:09:25 +0100 |
| commit | 6749ffa84028b5283889eb68b9bbec2e27049722 (patch) | |
| tree | 9ccddf873fd7198d5fe7671a0e58bfb8beb176be /drivers/staging/comedi | |
| parent | staging: comedi: ni_labpc_cs: remove pcmcia_device private data (diff) | |
| download | kernel-qcow2-linux-6749ffa84028b5283889eb68b9bbec2e27049722.tar.gz kernel-qcow2-linux-6749ffa84028b5283889eb68b9bbec2e27049722.tar.xz kernel-qcow2-linux-6749ffa84028b5283889eb68b9bbec2e27049722.zip | |
staging: comedi: ni_labpc_cs: move comedi_driver declaration
Move the comedi_driver declaration down in the file. This removes
the need for the forward declaration.
For aesthetic reasons, add some whitespace to the declaration and
remove the unnecessary '&' before the function names. They are
already addresses.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_cs.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index 831411d50ebb..669894c2a7cb 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -77,8 +77,6 @@ NI manuals: static struct pcmcia_device *pcmcia_cur_dev; -static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it); - static const struct labpc_board_struct labpc_cs_boards[] = { { .name = "daqcard-1200", @@ -115,16 +113,6 @@ static const struct labpc_board_struct labpc_cs_boards[] = { */ #define thisboard ((const struct labpc_board_struct *)dev->board_ptr) -static struct comedi_driver driver_labpc_cs = { - .driver_name = "ni_labpc_cs", - .module = THIS_MODULE, - .attach = &labpc_attach, - .detach = &labpc_common_detach, - .num_names = ARRAY_SIZE(labpc_cs_boards), - .board_name = &labpc_cs_boards[0].name, - .offset = sizeof(struct labpc_board_struct), -}; - static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct labpc_private *devpriv; @@ -154,6 +142,16 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) return labpc_common_attach(dev, iobase, irq, 0); } +static struct comedi_driver driver_labpc_cs = { + .driver_name = "ni_labpc_cs", + .module = THIS_MODULE, + .attach = labpc_attach, + .detach = labpc_common_detach, + .num_names = ARRAY_SIZE(labpc_cs_boards), + .board_name = &labpc_cs_boards[0].name, + .offset = sizeof(struct labpc_board_struct), +}; + static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data) { |