diff mbox series

[4/4,v2] sh: machvec: remove custom ioport_{un,}map()

Message ID 20230914155523.3839811-4-arnd@kernel.org
State New
Headers
Series [1/4,v2] sh: remove stale microdev board |

Commit Message

Arnd Bergmann Sept. 14, 2023, 3:55 p.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

These functions were only used on the microdev
board that is now gone, so remove them to simplify
the ioport handling.

This could be further simplified to use the generic
I/O port accessors now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/sh/include/asm/io.h      |  4 ++--
 arch/sh/include/asm/machvec.h |  5 -----
 arch/sh/kernel/ioport.c       | 13 +------------
 3 files changed, 3 insertions(+), 19 deletions(-)

Comments

John Paul Adrian Glaubitz Oct. 24, 2023, 4:33 p.m. UTC | #1 
On Thu, 2023-09-14 at 17:55 +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> These functions were only used on the microdev
> board that is now gone, so remove them to simplify
> the ioport handling.
> 
> This could be further simplified to use the generic
> I/O port accessors now.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  arch/sh/include/asm/io.h      |  4 ++--
>  arch/sh/include/asm/machvec.h |  5 -----
>  arch/sh/kernel/ioport.c       | 13 +------------
>  3 files changed, 3 insertions(+), 19 deletions(-)
> 
> diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
> index f2f38e9d489ac..ac521f287fa59 100644
> --- a/arch/sh/include/asm/io.h
> +++ b/arch/sh/include/asm/io.h
> @@ -181,7 +181,7 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port)	\
>  {									\
>  	volatile type *__addr;						\
>  									\
> -	__addr = __ioport_map(port, sizeof(type));			\
> +	__addr = (void __iomem *)sh_io_port_base + port;		\
>  	*__addr = val;							\
>  	slow;								\
>  }									\
> @@ -191,7 +191,7 @@ static inline type pfx##in##bwlq##p(unsigned long port)			\
>  	volatile type *__addr;						\
>  	type __val;							\
>  									\
> -	__addr = __ioport_map(port, sizeof(type));			\
> +	__addr = (void __iomem *)sh_io_port_base + port;		\
>  	__val = *__addr;						\
>  	slow;								\
>  									\
> diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
> index 2b4b085e8f219..4e5314b921f19 100644
> --- a/arch/sh/include/asm/machvec.h
> +++ b/arch/sh/include/asm/machvec.h
> @@ -19,11 +19,6 @@ struct sh_machine_vector {
>  	int (*mv_irq_demux)(int irq);
>  	void (*mv_init_irq)(void);
>  
> -#ifdef CONFIG_HAS_IOPORT_MAP
> -	void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
> -	void (*mv_ioport_unmap)(void __iomem *);
> -#endif
> -
>  	int (*mv_clk_init)(void);
>  	int (*mv_mode_pins)(void);
>  
> diff --git a/arch/sh/kernel/ioport.c b/arch/sh/kernel/ioport.c
> index f39446a658bdb..c8aff8a20164d 100644
> --- a/arch/sh/kernel/ioport.c
> +++ b/arch/sh/kernel/ioport.c
> @@ -12,15 +12,6 @@
>  unsigned long sh_io_port_base __read_mostly = -1;
>  EXPORT_SYMBOL(sh_io_port_base);
>  
> -void __iomem *__ioport_map(unsigned long addr, unsigned int size)
> -{
> -	if (sh_mv.mv_ioport_map)
> -		return sh_mv.mv_ioport_map(addr, size);
> -
> -	return (void __iomem *)(addr + sh_io_port_base);
> -}
> -EXPORT_SYMBOL(__ioport_map);
> -
>  void __iomem *ioport_map(unsigned long port, unsigned int nr)
>  {
>  	void __iomem *ret;
> @@ -29,13 +20,11 @@ void __iomem *ioport_map(unsigned long port, unsigned int nr)
>  	if (ret)
>  		return ret;
>  
> -	return __ioport_map(port, nr);
> +	return (void __iomem *)(port + sh_io_port_base);
>  }
>  EXPORT_SYMBOL(ioport_map);
>  
>  void ioport_unmap(void __iomem *addr)
>  {
> -	if (sh_mv.mv_ioport_unmap)
> -		sh_mv.mv_ioport_unmap(addr);
>  }
>  EXPORT_SYMBOL(ioport_unmap);

Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
diff mbox series

Patch

diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index f2f38e9d489ac..ac521f287fa59 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -181,7 +181,7 @@  static inline void pfx##out##bwlq##p(type val, unsigned long port)	\
 {									\
 	volatile type *__addr;						\
 									\
-	__addr = __ioport_map(port, sizeof(type));			\
+	__addr = (void __iomem *)sh_io_port_base + port;		\
 	*__addr = val;							\
 	slow;								\
 }									\
@@ -191,7 +191,7 @@  static inline type pfx##in##bwlq##p(unsigned long port)			\
 	volatile type *__addr;						\
 	type __val;							\
 									\
-	__addr = __ioport_map(port, sizeof(type));			\
+	__addr = (void __iomem *)sh_io_port_base + port;		\
 	__val = *__addr;						\
 	slow;								\
 									\
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
index 2b4b085e8f219..4e5314b921f19 100644
--- a/arch/sh/include/asm/machvec.h
+++ b/arch/sh/include/asm/machvec.h
@@ -19,11 +19,6 @@  struct sh_machine_vector {
 	int (*mv_irq_demux)(int irq);
 	void (*mv_init_irq)(void);
 
-#ifdef CONFIG_HAS_IOPORT_MAP
-	void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
-	void (*mv_ioport_unmap)(void __iomem *);
-#endif
-
 	int (*mv_clk_init)(void);
 	int (*mv_mode_pins)(void);
 
diff --git a/arch/sh/kernel/ioport.c b/arch/sh/kernel/ioport.c
index f39446a658bdb..c8aff8a20164d 100644
--- a/arch/sh/kernel/ioport.c
+++ b/arch/sh/kernel/ioport.c
@@ -12,15 +12,6 @@ 
 unsigned long sh_io_port_base __read_mostly = -1;
 EXPORT_SYMBOL(sh_io_port_base);
 
-void __iomem *__ioport_map(unsigned long addr, unsigned int size)
-{
-	if (sh_mv.mv_ioport_map)
-		return sh_mv.mv_ioport_map(addr, size);
-
-	return (void __iomem *)(addr + sh_io_port_base);
-}
-EXPORT_SYMBOL(__ioport_map);
-
 void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
 	void __iomem *ret;
@@ -29,13 +20,11 @@  void __iomem *ioport_map(unsigned long port, unsigned int nr)
 	if (ret)
 		return ret;
 
-	return __ioport_map(port, nr);
+	return (void __iomem *)(port + sh_io_port_base);
 }
 EXPORT_SYMBOL(ioport_map);
 
 void ioport_unmap(void __iomem *addr)
 {
-	if (sh_mv.mv_ioport_unmap)
-		sh_mv.mv_ioport_unmap(addr);
 }
 EXPORT_SYMBOL(ioport_unmap);