Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0eeed40 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eca7cf72

drivers/staging/comedi/drivers/ni_labpc.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ static inline void labpc_writeb(unsigned int byte, unsigned long address) 
	writeb(byte, (void __iomem *)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[] = {

static const struct labpc_boardinfo labpc_boards[] = {

	{

	{

		.name			= "lab-pc-1200",

		.name			= "lab-pc-1200",
@@ -1710,10 +1710,9 @@ void labpc_common_detach(struct comedi_device *dev) 
}

}

EXPORT_SYMBOL_GPL(labpc_common_detach);

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)

static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)

{

{

	const struct labpc_boardinfo *board = comedi_board(dev);

	struct labpc_private *devpriv;

	struct labpc_private *devpriv;

	unsigned int irq = it->options[1];

	unsigned int irq = it->options[1];

	unsigned int dma_chan = it->options[2];

	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;

	return 0;

}

}





void labpc_detach(struct comedi_device *dev)

static void labpc_detach(struct comedi_device *dev)

{

{

	struct labpc_private *devpriv = dev->private;

	struct labpc_private *devpriv = dev->private;