Skip to contentSkip to conversation

staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled

PATCH In review Randy Dunlap 2 participants 4 messages Sep 8, 2011 – Sep 18, 2011 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_ISA_DMA_API is enabled but
CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.
Fixes these build errors:

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

---

Greg, I had previously said that this patch was not needed since you had merged a larger patch, but I had another build error which this patch fixes, so it is now needed in mainline.

 drivers/staging/comedi/drivers/ni_labpc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/ni_labpc.c +3 -1
@@ -241,8 +241,10 @@ static int labpc_eeprom_write_insn(struc
 				   struct comedi_insn *insn,
 				   unsigned int *data);
 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);
+#endif
+#ifdef CONFIG_COMEDI_PCI
 static int labpc_find_device(struct comedi_device *dev, int bus, int slot);
 #endif
 static int labpc_dio_mem_callback(int dir, int port, int data,
#1 lore raw
Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_ISA_DMA_API is enabled but
CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.
Fixes these build errors:

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

Quoted 6 lines

---

Greg, I had previously said that this patch was not needed since you had merged a larger patch, but I had another build error which this patch fixes, so it is now needed in mainline.

So this is needed in Linus's tree now? Or in linux-next? It doesn't apply to my staging-next tree so I'm confused.

thanks,

greg k-h

#2 lore raw
Quoted 16 lines · Greg KH
Quoted 15 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_ISA_DMA_API is enabled but
CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.
Fixes these build errors:

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

---

Quoted 6 lines
Quoted 3 lines

Greg, I had previously said that this patch was not needed since you had merged a larger patch, but I had another build error which this patch fixes, so it is now needed in mainline.

So this is needed in Linus's tree now? Or in linux-next? It doesn't apply to my staging-next tree so I'm confused.

Now dropped from my to-apply queue.

If this is still needed, please resend.

greg k-h

#3 lore raw
Quoted 17 lines · Greg KH
Quoted 16 lines · Greg KH
Quoted 15 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_ISA_DMA_API is enabled but
CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.
Fixes these build errors:

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

---

Quoted 6 lines
Quoted 6 lines
Quoted 3 lines

Greg, I had previously said that this patch was not needed since you had merged a larger patch, but I had another build error which this patch fixes, so it is now needed in mainline.

So this is needed in Linus's tree now? Or in linux-next? It doesn't apply to my staging-next tree so I'm confused.

Somehow I didn't see the message above.

The patch applies cleanly to Linus' current tree.

Quoted 3 lines

Now dropped from my to-apply queue.

If this is still needed, please resend.

Yes, it is still needed. Please see below.

---
From: Randy Dunlap <[email protected]>

Fix build when CONFIG_ISA_DMA_API is enabled but
CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.
Fixes these build errors:

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

---
 drivers/staging/comedi/drivers/ni_labpc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/ni_labpc.c +3 -1
@@ -241,8 +241,10 @@ static int labpc_eeprom_write_insn(struc
 				   struct comedi_insn *insn,
 				   unsigned int *data);
 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);
+#endif
+#ifdef CONFIG_COMEDI_PCI
 static int labpc_find_device(struct comedi_device *dev, int bus, int slot);
 #endif
 static int labpc_dio_mem_callback(int dir, int port, int data,