[uClinux-dev] [PATCH] m68k: Add missing ioport_unmap()

2014-09-14 Thread Geert Uytterhoeven
drivers/net/ethernet/cirrus/cs89x0.c: In function ‘cs89x0_ioport_probe’:
drivers/net/ethernet/cirrus/cs89x0.c:1629: error: implicit declaration of 
function ‘ioport_unmap’

Add the missing ioport_unmap() implementation, and convert ioport_map()
from a macro to a static inline function while we're at it (both copied
from asm-generic).

Signed-off-by: Geert Uytterhoeven 
---
 arch/m68k/include/asm/io_mm.h | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index ffdf54f44bc6..8955b40a5dc4 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -510,6 +510,13 @@ static inline void memcpy_toio(volatile void __iomem *dst, 
const void *src, int
  */
 #define xlate_dev_kmem_ptr(p)  p
 
-#define ioport_map(port, nr)   ((void __iomem *)(port))
+static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
+{
+   return (void __iomem *) port;
+}
+
+static inline void ioport_unmap(void __iomem *p)
+{
+}
 
 #endif /* _IO_H */
-- 
1.9.1

___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

Re: [uClinux-dev] [PATCH] m68k: Add missing ioport_unmap()

2014-09-14 Thread Greg Ungerer
Hi Geert,

On 14/09/14 19:45, Geert Uytterhoeven wrote:
> drivers/net/ethernet/cirrus/cs89x0.c: In function ‘cs89x0_ioport_probe’:
> drivers/net/ethernet/cirrus/cs89x0.c:1629: error: implicit declaration of 
> function ‘ioport_unmap’
> 
> Add the missing ioport_unmap() implementation, and convert ioport_map()
> from a macro to a static inline function while we're at it (both copied
> from asm-generic).

The non-mmu version of this, io_no.h, doesn't implement these either.
Should it?

Regards
Greg


> Signed-off-by: Geert Uytterhoeven 
> ---
>  arch/m68k/include/asm/io_mm.h | 9 -
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
> index ffdf54f44bc6..8955b40a5dc4 100644
> --- a/arch/m68k/include/asm/io_mm.h
> +++ b/arch/m68k/include/asm/io_mm.h
> @@ -510,6 +510,13 @@ static inline void memcpy_toio(volatile void __iomem 
> *dst, const void *src, int
>   */
>  #define xlate_dev_kmem_ptr(p)p
>  
> -#define ioport_map(port, nr) ((void __iomem *)(port))
> +static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
> +{
> + return (void __iomem *) port;
> +}
> +
> +static inline void ioport_unmap(void __iomem *p)
> +{
> +}
>  
>  #endif /* _IO_H */
> 

___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev