public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence
@ 2014-10-15 21:25 David Cohen
  2014-10-15 21:57 ` Ian Abbott
  0 siblings, 1 reply; 4+ messages in thread
From: David Cohen @ 2014-10-15 21:25 UTC (permalink / raw)
  To: abbotti, hsweeten, gregkh; +Cc: trivial, devel, linux-kernel, 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 <david.a.cohen@linux.intel.com>
---
 drivers/staging/comedi/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index a8bc2b567789..56be2112c731 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -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
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence
  2014-10-15 21:25 [PATCH] staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence David Cohen
@ 2014-10-15 21:57 ` Ian Abbott
  2014-10-15 22:06   ` David Cohen
  0 siblings, 1 reply; 4+ messages in thread
From: Ian Abbott @ 2014-10-15 21:57 UTC (permalink / raw)
  To: David Cohen, hsweeten, gregkh; +Cc: trivial, devel, linux-kernel

On 15/10/14 22:25, David Cohen wrote:
> 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 <david.a.cohen@linux.intel.com>
> ---
>   drivers/staging/comedi/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> index a8bc2b567789..56be2112c731 100644
> --- a/drivers/staging/comedi/Kconfig
> +++ b/drivers/staging/comedi/Kconfig
> @@ -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 <abbotti@mev.co.uk>

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence
  2014-10-15 21:57 ` Ian Abbott
@ 2014-10-15 22:06   ` David Cohen
  2014-10-16 13:36     ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: David Cohen @ 2014-10-15 22:06 UTC (permalink / raw)
  To: Ian Abbott; +Cc: hsweeten, gregkh, trivial, devel, linux-kernel

On Wed, Oct 15, 2014 at 10:57:00PM +0100, Ian Abbott wrote:
> On 15/10/14 22:25, David Cohen wrote:
> >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 <david.a.cohen@linux.intel.com>
> >---
> >  drivers/staging/comedi/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> >
> >diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> >index a8bc2b567789..56be2112c731 100644
> >--- a/drivers/staging/comedi/Kconfig
> >+++ b/drivers/staging/comedi/Kconfig
> >@@ -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

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

> 
> Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
> 
> -- 
> -=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
> -=(                          Web: http://www.mev.co.uk/  )=-

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence
  2014-10-15 22:06   ` David Cohen
@ 2014-10-16 13:36     ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2014-10-16 13:36 UTC (permalink / raw)
  To: David Cohen; +Cc: Ian Abbott, hsweeten, trivial, devel, linux-kernel

On Wed, Oct 15, 2014 at 03:06:54PM -0700, David Cohen wrote:
> On Wed, Oct 15, 2014 at 10:57:00PM +0100, Ian Abbott wrote:
> > On 15/10/14 22:25, David Cohen wrote:
> > >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 <david.a.cohen@linux.intel.com>
> > >---
> > >  drivers/staging/comedi/Kconfig | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > >diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> > >index a8bc2b567789..56be2112c731 100644
> > >--- a/drivers/staging/comedi/Kconfig
> > >+++ b/drivers/staging/comedi/Kconfig
> > >@@ -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
> 
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-10-16 13:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-15 21:25 [PATCH] staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence David Cohen
2014-10-15 21:57 ` Ian Abbott
2014-10-15 22:06   ` David Cohen
2014-10-16 13:36     ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox