diff options
author | H Hartley Sweeten | 2013-01-26 01:35:19 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-01-30 05:08:23 +0100 |
commit | 616b7a479e190e099f75073231c027fa393da5b2 (patch) | |
tree | 3339634006ae913b8c57e1ba8861075c0109bbf5 /drivers/staging/comedi | |
parent | staging: comedi: ni_mio_cs: move mio_cs_detach() (diff) | |
download | kernel-qcow2-linux-616b7a479e190e099f75073231c027fa393da5b2.tar.gz kernel-qcow2-linux-616b7a479e190e099f75073231c027fa393da5b2.tar.xz kernel-qcow2-linux-616b7a479e190e099f75073231c027fa393da5b2.zip |
staging: comedi: ni_mio_cs: remove last forward declaration
Move the ni_getboardtype() function to remove the last forward
declaration in this file.
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_mio_cs.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index 2d28a71511aa..a9cd552a7284 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -227,10 +227,23 @@ static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr) #include "ni_mio_common.c" +static struct pcmcia_device *cur_dev; + static int ni_getboardtype(struct comedi_device *dev, - struct pcmcia_device *link); + struct pcmcia_device *link) +{ + int i; -static struct pcmcia_device *cur_dev; + for (i = 0; i < n_ni_boards; i++) { + if (ni_boards[i].device_id == link->card_id) + return i; + } + + dev_err(dev->class_dev, + "unknown board 0x%04x -- pretend it is a ", link->card_id); + + return 0; +} static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) { @@ -301,22 +314,6 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) return 0; } -static int ni_getboardtype(struct comedi_device *dev, - struct pcmcia_device *link) -{ - int i; - - for (i = 0; i < n_ni_boards; i++) { - if (ni_boards[i].device_id == link->card_id) - return i; - } - - dev_err(dev->class_dev, - "unknown board 0x%04x -- pretend it is a ", link->card_id); - - return 0; -} - static void mio_cs_detach(struct comedi_device *dev) { mio_common_detach(dev); |