staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence

PATCH In review David Cohen 3 participants 4 messages Oct 15, 2014 – Oct 16, 2014 Staging

lore

Share & tools

lore

David Cohen

author

2014-10-15 21:25 UTC #0 lore raw

PATCH 1/1 staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence

ii_pci20kc uses io memory which makes it not compilable on architectures without HAS_IOMEM such as UML:

CC drivers/net/wireless/ti/wl1251/main.o
drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_attach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:442:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration]
dev->mmio = ioremap(membase, II20K_SIZE);
^
drivers/staging/comedi/drivers/ii_pci20kc.c:442:12: warning: assignment makes pointer from integer without a cast

  dev->mmio = ioremap(membase, II20K_SIZE);
            ^

drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_detach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:512:3: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
iounmap(dev->mmio);
^

Signed-off-by David Cohen <[email protected]>

---
 drivers/staging/comedi/Kconfig | 1 +
 1 file changed, 1 insertion(+)

drivers/staging/comedi/Kconfig +1 -0

index a8bc2b567789..56be2112c731 100644
@@ -425,6 +425,7 @@ config COMEDI_AIO_IIRO_16
 	  called aio_iiro_16.
 
 config COMEDI_II_PCI20KC
+	depends on HAS_IOMEM
 	tristate "Intelligent Instruments PCI-20001C carrier support"
 	---help---
 	  Enable support for Intelligent Instruments PCI-20001C carrier

Signature · 1 line

2.1.0

Ian Abbott

Reviewed-by on v1 1/1

2014-10-15 21:57 UTC #1 lore raw

Quoted 32 lines · David Cohen

ii_pci20kc uses io memory which makes it not compilable on architectures without HAS_IOMEM such as UML:
CC drivers/net/wireless/ti/wl1251/main.o
drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_attach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:442:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration]
   dev->mmio = ioremap(membase, II20K_SIZE);
   ^
drivers/staging/comedi/drivers/ii_pci20kc.c:442:12: warning: assignment
makes pointer from integer without a cast
   dev->mmio = ioremap(membase, II20K_SIZE);
             ^
drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_detach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:512:3: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
    iounmap(dev->mmio);
    ^
Signed-off-by David Cohen <[email protected]>
---
  drivers/staging/comedi/Kconfig | 1 +
  1 file changed, 1 insertion(+)
drivers/staging/comedi/Kconfig +0 -0
index a8bc2b567789..56be2112c731 100644

drivers/staging/comedi/Kconfig config COMEDI_AIO_IIRO_16 · line 431

Quoted 7 lines

drivers/staging/comedi/Kconfig +1 -0

@@ -425,6 +425,7 @@ config COMEDI_AIO_IIRO_16
  	  called aio_iiro_16.
 
  config COMEDI_II_PCI20KC
+	depends on HAS_IOMEM
  	tristate "Intelligent Instruments PCI-20001C carrier support"
  	---help---
  	  Enable support for Intelligent Instruments PCI-20001C carrier

The same fix was already submitted by Chen Gang:

https://lkml.org/lkml/2014/10/2/318

Reviewed-by Ian Abbott <[email protected]>

Signature · 2 lines

-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

David Cohen

author

2014-10-15 22:06 UTC #2 lore raw

Quoted 43 lines · Ian Abbott

Quoted 32 lines · David Cohen
ii_pci20kc uses io memory which makes it not compilable on architectures without HAS_IOMEM such as UML:
CC drivers/net/wireless/ti/wl1251/main.o
drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_attach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:442:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration]
dev->mmio = ioremap(membase, II20K_SIZE);
^
drivers/staging/comedi/drivers/ii_pci20kc.c:442:12: warning: assignment makes pointer from integer without a cast
  dev->mmio = ioremap(membase, II20K_SIZE);
            ^
drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_detach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:512:3: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
   iounmap(dev->mmio);
   ^
Signed-off-by David Cohen <[email protected]>
---
 drivers/staging/comedi/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/staging/comedi/Kconfig +0 -0
index a8bc2b567789..56be2112c731 100644
drivers/staging/comedi/Kconfig config COMEDI_AIO_IIRO_16 · line 431
Quoted 7 lines
drivers/staging/comedi/Kconfig +1 -0
@@ -425,6 +425,7 @@ config COMEDI_AIO_IIRO_16
 	  called aio_iiro_16.
 
 config COMEDI_II_PCI20KC
+	depends on HAS_IOMEM
 	tristate "Intelligent Instruments PCI-20001C carrier support"
 	---help---
 	  Enable support for Intelligent Instruments PCI-20001C carrier
The same fix was already submitted by Chen Gang:

Quoted 1 line

https://lkml.org/lkml/2014/10/2/318

Thanks. I sent this patch based on today's linux-next's "make ARCH=um allyesconfig". But nevermind if it was already sent.

Br, David

Quoted 6 lines

Reviewed-by Ian Abbott <[email protected]>
Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]> )=-
-=(                          Web: http://www.mev.co.uk/  )=-

Greg KH

maintainer

2014-10-16 13:37 UTC #3 lore raw

Quoted 44 lines · David Cohen

Quoted 43 lines · Ian Abbott
Quoted 32 lines · David Cohen
ii_pci20kc uses io memory which makes it not compilable on architectures without HAS_IOMEM such as UML:
CC drivers/net/wireless/ti/wl1251/main.o
drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_attach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:442:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration]
dev->mmio = ioremap(membase, II20K_SIZE);
^
drivers/staging/comedi/drivers/ii_pci20kc.c:442:12: warning: assignment makes pointer from integer without a cast
  dev->mmio = ioremap(membase, II20K_SIZE);
            ^
drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_detach’:
drivers/staging/comedi/drivers/ii_pci20kc.c:512:3: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
   iounmap(dev->mmio);
   ^
Signed-off-by David Cohen <[email protected]>
---
 drivers/staging/comedi/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/staging/comedi/Kconfig +0 -0
index a8bc2b567789..56be2112c731 100644
drivers/staging/comedi/Kconfig config COMEDI_AIO_IIRO_16 · line 431
Quoted 7 lines
drivers/staging/comedi/Kconfig +1 -0
@@ -425,6 +425,7 @@ config COMEDI_AIO_IIRO_16
 	  called aio_iiro_16.
 
 config COMEDI_II_PCI20KC
+	depends on HAS_IOMEM
 	tristate "Intelligent Instruments PCI-20001C carrier support"
 	---help---
 	  Enable support for Intelligent Instruments PCI-20001C carrier
The same fix was already submitted by Chen Gang:

Quoted 4 lines

Quoted 1 line
https://lkml.org/lkml/2014/10/2/318
Thanks. I sent this patch based on today's linux-next's "make ARCH=um allyesconfig". But nevermind if it was already sent.

I can't add patches, even bugfixes, to my trees until 3.18-rc1 is out, which is why this fix isn't in linux-next.

thanks,

greg k-h