iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sh: machvec: Remove custom ioport_{un,}map()

Browse Source 
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>
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Link: https://lore.kernel.org/r/20230914155523.3839811-4-arnd@kernel.org
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
This commit is contained in:
Arnd Bergmann 2023-09-14 17:55:23 +02:00 committed by John Paul Adrian Glaubitz
parent 8daaed7638
commit 4c02add1d9
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/include/asm/io.h
View File

@ -181,7 +181,7 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port) \
{ \ { \
volatile type *__addr; \ volatile type *__addr; \
\ \
__addr = __ioport_map(port, sizeof(type)); \ __addr = (void __iomem *)sh_io_port_base + port; \
*__addr = val; \ *__addr = val; \
slow; \ slow; \
} \ } \
@ -191,7 +191,7 @@ static inline type pfx##in##bwlq##p(unsigned long port) \
volatile type *__addr; \ volatile type *__addr; \
type __val; \ type __val; \
\ \
__addr = __ioport_map(port, sizeof(type)); \ __addr = (void __iomem *)sh_io_port_base + port; \
__val = *__addr; \ __val = *__addr; \
slow; \ slow; \
\ \

5
arch/sh/include/asm/machvec.h
View File

@ -19,11 +19,6 @@ struct sh_machine_vector {
int (*mv_irq_demux)(int irq); int (*mv_irq_demux)(int irq);
void (*mv_init_irq)(void); 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_clk_init)(void);
int (*mv_mode_pins)(void); int (*mv_mode_pins)(void);

13
arch/sh/kernel/ioport.c
View File

@ -12,15 +12,6 @@
unsigned long sh_io_port_base __read_mostly = -1; unsigned long sh_io_port_base __read_mostly = -1;
EXPORT_SYMBOL(sh_io_port_base); 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 *ioport_map(unsigned long port, unsigned int nr)
{ {
void __iomem *ret; void __iomem *ret;
@ -29,13 +20,11 @@ void __iomem *ioport_map(unsigned long port, unsigned int nr)
if (ret) if (ret)
return ret; return ret;
return __ioport_map(port, nr); return (void __iomem *)(port + sh_io_port_base);
} }
EXPORT_SYMBOL(ioport_map); EXPORT_SYMBOL(ioport_map);
void ioport_unmap(void __iomem *addr) void ioport_unmap(void __iomem *addr)
{ {
if (sh_mv.mv_ioport_unmap)
sh_mv.mv_ioport_unmap(addr);
} }
EXPORT_SYMBOL(ioport_unmap); EXPORT_SYMBOL(ioport_unmap);