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

Commit d6aa8366 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

staging: fix comedi build errors 



Fix build errors when CONFIG_COMEDI_PCI_DRIVERS is not enabled
and CONFIG_COMEDI_PCI_DRIVERS was used where CONFIG_ISA_DMA_API
should have been used.

drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_ai_cmd':
drivers/staging/comedi/drivers/ni_labpc.c:1351: error: implicit declaration of function 'labpc_suggest_transfer_size'
drivers/staging/comedi/drivers/ni_labpc.c: At top level:
drivers/staging/comedi/drivers/ni_labpc.c:1802: error: conflicting types for 'labpc_suggest_transfer_size'
drivers/staging/comedi/drivers/ni_labpc.c:1351: note: previous implicit declaration of 'labpc_suggest_transfer_size' was here

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 13a9e03c

drivers/staging/comedi/drivers/ni_labpc.c

+11 −9
Original line number Original line Diff line number Diff line
@@ -241,8 +241,10 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev, 
				   struct comedi_insn *insn,

				   struct comedi_insn *insn,

				   unsigned int *data);

				   unsigned int *data);

static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd);

static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd);

#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_ISA_DMA_API

static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd);

static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd);

#endif

#ifdef CONFIG_COMEDI_PCI_DRIVERS

static int labpc_find_device(struct comedi_device *dev, int bus, int slot);

static int labpc_find_device(struct comedi_device *dev, int bus, int slot);

#endif

#endif

static int labpc_dio_mem_callback(int dir, int port, int data,

static int labpc_dio_mem_callback(int dir, int port, int data,
@@ -459,7 +461,7 @@ static const struct labpc_board_struct labpc_boards[] = { 
	 .ai_scan_up = 0,

	 .ai_scan_up = 0,

	 .memory_mapped_io = 0,

	 .memory_mapped_io = 0,

	 },

	 },

#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_COMEDI_PCI_DRIVERS

	{

	{

	 .name = "pci-1200",

	 .name = "pci-1200",

	 .device_id = 0x161,

	 .device_id = 0x161,
@@ -503,14 +505,14 @@ static struct comedi_driver driver_labpc = { 
	.offset = sizeof(struct labpc_board_struct),

	.offset = sizeof(struct labpc_board_struct),

};

};





#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_COMEDI_PCI_DRIVERS

static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {

static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {

	{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x161)},

	{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x161)},

	{0}

	{0}

};

};





MODULE_DEVICE_TABLE(pci, labpc_pci_table);

MODULE_DEVICE_TABLE(pci, labpc_pci_table);

#endif /* CONFIG_COMEDI_PCI */

#endif /* CONFIG_COMEDI_PCI_DRIVERS */





static inline int labpc_counter_load(struct comedi_device *dev,

static inline int labpc_counter_load(struct comedi_device *dev,

				     unsigned long base_address,

				     unsigned long base_address,
@@ -720,7 +722,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	unsigned long iobase = 0;

	unsigned long iobase = 0;

	unsigned int irq = 0;

	unsigned int irq = 0;

	unsigned int dma_chan = 0;

	unsigned int dma_chan = 0;

#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_COMEDI_PCI_DRIVERS

	int retval;

	int retval;

#endif

#endif
@@ -742,7 +744,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
#endif

#endif

		break;

		break;

	case pci_bustype:

	case pci_bustype:

#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_COMEDI_PCI_DRIVERS

		retval = labpc_find_device(dev, it->options[0], it->options[1]);

		retval = labpc_find_device(dev, it->options[0], it->options[1]);

		if (retval < 0)

		if (retval < 0)

			return retval;

			return retval;
@@ -772,7 +774,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
}

}





/* adapted from ni_pcimio for finding mite based boards (pc-1200) */

/* adapted from ni_pcimio for finding mite based boards (pc-1200) */

#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_COMEDI_PCI_DRIVERS

static int labpc_find_device(struct comedi_device *dev, int bus, int slot)

static int labpc_find_device(struct comedi_device *dev, int bus, int slot)

{

{

	struct mite_struct *mite;

	struct mite_struct *mite;
@@ -820,7 +822,7 @@ int labpc_common_detach(struct comedi_device *dev) 
		free_irq(dev->irq, dev);

		free_irq(dev->irq, dev);

	if (thisboard->bustype == isa_bustype && dev->iobase)

	if (thisboard->bustype == isa_bustype && dev->iobase)

		release_region(dev->iobase, LABPC_SIZE);

		release_region(dev->iobase, LABPC_SIZE);

#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_COMEDI_PCI_DRIVERS

	if (devpriv->mite)

	if (devpriv->mite)

		mite_unsetup(devpriv->mite);

		mite_unsetup(devpriv->mite);

#endif

#endif
@@ -2135,7 +2137,7 @@ static void write_caldac(struct comedi_device *dev, unsigned int channel, 
	devpriv->write_byte(devpriv->command5_bits, dev->iobase + COMMAND5_REG);

	devpriv->write_byte(devpriv->command5_bits, dev->iobase + COMMAND5_REG);

}

}





#ifdef CONFIG_COMEDI_PCI

#ifdef CONFIG_COMEDI_PCI_DRIVERS

static int __devinit driver_labpc_pci_probe(struct pci_dev *dev,

static int __devinit driver_labpc_pci_probe(struct pci_dev *dev,

					    const struct pci_device_id *ent)

					    const struct pci_device_id *ent)

{

{