diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-23 11:05:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 12:55:03 -0700 |
| commit | a0eeed40100b2eca57afdf99d76c57dedd218a8a (patch) | |
| tree | cece34cb7c50006f934d7b65c6111d750488673d | |
| parent | eca7cf725617c08f02a9f74155ced6d2de9f0a63 (diff) | |
| download | blackbird-op-linux-a0eeed40100b2eca57afdf99d76c57dedd218a8a.tar.gz blackbird-op-linux-a0eeed40100b2eca57afdf99d76c57dedd218a8a.zip | |
staging: comedi: ni_labpc: fix legacy driver build
CONFIG_COMEDI_NI_LABPC_ISA is a tristate option. #if IS_ENABLED()
needs to be used instead of #ifdef in order to build the legacy
specific code in this driver.
The local variable 'board' is not used in labpc_attach(). Remove it.
The labpc_detach() function is only referenced in this file. Make
it static.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index bb68d8fa83a3..3d978f34d212 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -234,7 +234,7 @@ static inline void labpc_writeb(unsigned int byte, unsigned long address) writeb(byte, (void __iomem *)address); } -#ifdef CONFIG_COMEDI_NI_LABPC_ISA +#if IS_ENABLED(CONFIG_COMEDI_NI_LABPC_ISA) static const struct labpc_boardinfo labpc_boards[] = { { .name = "lab-pc-1200", @@ -1710,10 +1710,9 @@ void labpc_common_detach(struct comedi_device *dev) } EXPORT_SYMBOL_GPL(labpc_common_detach); -#ifdef CONFIG_COMEDI_NI_LABPC_ISA +#if IS_ENABLED(CONFIG_COMEDI_NI_LABPC_ISA) static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - const struct labpc_boardinfo *board = comedi_board(dev); struct labpc_private *devpriv; unsigned int irq = it->options[1]; unsigned int dma_chan = it->options[2]; @@ -1756,7 +1755,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) return 0; } -void labpc_detach(struct comedi_device *dev) +static void labpc_detach(struct comedi_device *dev) { struct labpc_private *devpriv = dev->private; |
