Menu
▾
▴
[linuxsh-dev] Remove ioremap_nocache from machine vector
|
From: NIIBE Y. <gn...@ch...> - 2000-10-27 02:34:44
|
I think that we don't need ioremap_nocache API. We see it in the
MIPS port, but I don't know the drivers which uses it.
2000-10-27 NIIBE Yutaka <gn...@m1...>
* arch/sh/kernel/mach_unknown.c (mv_ioremap_nocache): Removed.
* arch/sh/kernel/mach_se.c (mv_ioremap_nocache): Removed.
* arch/sh/kernel/io_unknown.c (ioremap_nocache): Removed.
* arch/sh/kernel/io_generic.c (generic_ioremap_nocache): Removed.
* include/asm-sh/io_unknown.h (unknown_ioremap_nocache,
__ioremap_nocache): Removed.
* include/asm-sh/io_se.h (__ioremap_nocache): Removed.
* include/asm-sh/io_od.h (__ioremap_nocache): Removed.
* include/asm-sh/io_hd64465.h (__ioremap_nocache): Removed.
* include/asm-sh/io_generic.h (generic_ioremap_nocache): Removed.
* include/asm-sh/io.h (__ioremap_nocache): Removed.
* include/asm-sh/io.h (ioremap_nocache): Removed.
* include/asm-sh/machvec.h (struct sh_machine_vector): Removed
ioremap_nocache.
Index: include/asm-sh/io.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io.h,v
retrieving revision 1.8
diff -u -p -r1.8 io.h
--- include/asm-sh/io.h 2000/10/12 07:29:21 1.8
+++ include/asm-sh/io.h 2000/10/27 02:25:45
@@ -70,7 +70,6 @@
# define __writel(v,a) sh_mv.mv_writel((v),(a))
# define __ioremap(a,s) sh_mv.mv_ioremap((a), (s))
-# define __ioremap_nocache(a,s) sh_mv.mv_ioremap_nocache((a), (s))
# define __iounmap(a) sh_mv.mv_iounmap((a))
# define __isa_port2addr(a) sh_mv.mv_isa_port2addr(a)
@@ -412,16 +411,6 @@ extern __inline__ void * phys_to_virt(un
static __inline__ void * ioremap(unsigned long offset, unsigned long size)
{
return __ioremap(offset, size);
-}
-
-/*
- * This one maps high address device memory and turns off caching for that area.
- * it's useful if some control registers are in such an area and write combining
- * or read caching is not desirable:
- */
-static __inline__ void * ioremap_nocache (unsigned long offset, unsigned long size)
-{
- return __ioremap_nocache(offset, size);
}
static __inline__ void iounmap(void *addr)
Index: include/asm-sh/io_generic.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io_generic.h,v
retrieving revision 1.3
diff -u -p -r1.3 io_generic.h
--- include/asm-sh/io_generic.h 2000/08/05 06:25:25 1.3
+++ include/asm-sh/io_generic.h 2000/10/27 02:25:45
@@ -44,7 +44,6 @@ extern void generic_writew(unsigned shor
extern void generic_writel(unsigned int b, unsigned long addr);
extern void *generic_ioremap(unsigned long offset, unsigned long size);
-extern void *generic_ioremap_nocache (unsigned long offset, unsigned long size);
extern void generic_iounmap(void *addr);
extern unsigned long generic_isa_port2addr(unsigned long offset);
Index: include/asm-sh/io_hd64465.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io_hd64465.h,v
retrieving revision 1.2
diff -u -p -r1.2 io_hd64465.h
--- include/asm-sh/io_hd64465.h 2000/10/16 05:19:34 1.2
+++ include/asm-sh/io_hd64465.h 2000/10/27 02:25:45
@@ -81,7 +81,6 @@ extern void hd64465_port_unmap(unsigned
# define __isa_port2addr hd64465_isa_port2addr
# define __ioremap generic_ioremap
-# define __ioremap_nocache generic_ioremap_nocache
# define __iounmap generic_iounmap
Index: include/asm-sh/io_od.h
===================================================================
Index: arch/sh/kernel/io_generic.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/io_generic.c,v
retrieving revision 1.9
diff -u -p -r1.9 io_generic.c
--- arch/sh/kernel/io_generic.c 2000/10/16 05:03:30 1.9
+++ arch/sh/kernel/io_generic.c 2000/10/27 02:25:43
@@ -188,12 +188,6 @@ void * generic_ioremap(unsigned long off
}
EXPORT_SYMBOL(generic_ioremap);
-void * generic_ioremap_nocache (unsigned long offset, unsigned long size)
-{
- return (void *) P2SEGADDR(offset);
-}
-EXPORT_SYMBOL(generic_ioremap_nocache);
-
void generic_iounmap(void *addr)
{
}
Index: arch/sh/kernel/io_unknown.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/io_unknown.c,v
retrieving revision 1.2
diff -u -p -r1.2 io_unknown.c
--- arch/sh/kernel/io_unknown.c 2000/08/05 06:25:23 1.2
+++ arch/sh/kernel/io_unknown.c 2000/10/27 02:25:43
@@ -43,5 +43,4 @@ UNKNOWN_ALIAS(writew)
UNKNOWN_ALIAS(writel)
UNKNOWN_ALIAS(isa_port2addr)
UNKNOWN_ALIAS(ioremap)
-UNKNOWN_ALIAS(ioremap_nocache)
UNKNOWN_ALIAS(iounmap)
Index: arch/sh/kernel/mach_se.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/mach_se.c,v
retrieving revision 1.2
diff -u -p -r1.2 mach_se.c
--- arch/sh/kernel/mach_se.c 2000/08/23 01:36:49 1.2
+++ arch/sh/kernel/mach_se.c 2000/10/27 02:25:43
@@ -65,7 +65,6 @@ struct sh_machine_vector mv_se __initmv
mv_writel: se_writel,
mv_ioremap: generic_ioremap,
- mv_ioremap_nocache: generic_ioremap_nocache,
mv_iounmap: generic_iounmap,
mv_isa_port2addr: se_isa_port2addr,
Index: arch/sh/kernel/mach_unknown.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/mach_unknown.c,v
retrieving revision 1.2
diff -u -p -r1.2 mach_unknown.c
--- arch/sh/kernel/mach_unknown.c 2000/08/23 01:36:49 1.2
+++ arch/sh/kernel/mach_unknown.c 2000/10/27 02:25:43
@@ -61,7 +61,6 @@ struct sh_machine_vector mv_unknown __in
mv_writel: unknown_writel,
mv_ioremap: unknown_ioremap,
- mv_ioremap_nocache: unknown_ioremap_nocache,
mv_iounmap: unknown_iounmap,
mv_isa_port2addr: unknown_isa_port2addr,
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io_od.h,v
retrieving revision 1.2
diff -u -p -r1.2 io_od.h
--- include/asm-sh/io_od.h 2000/08/01 03:18:39 1.2
+++ include/asm-sh/io_od.h 2000/10/27 02:25:45
@@ -70,7 +70,6 @@ extern unsigned long od_isa_port2addr(un
# define __isa_port2addr od_isa_port2addr
# define __ioremap generic_ioremap
-# define __ioremap_nocache generic_ioremap_nocache
# define __iounmap generic_iounmap
#endif
Index: include/asm-sh/io_se.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io_se.h,v
retrieving revision 1.2
diff -u -p -r1.2 io_se.h
--- include/asm-sh/io_se.h 2000/08/01 03:18:39 1.2
+++ include/asm-sh/io_se.h 2000/10/27 02:25:45
@@ -73,7 +73,6 @@ extern unsigned long se_isa_port2addr(un
# define __isa_port2addr se_isa_port2addr
# define __ioremap generic_ioremap
-# define __ioremap_nocache generic_ioremap_nocache
# define __iounmap generic_iounmap
#endif
Index: include/asm-sh/io_unknown.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io_unknown.h,v
retrieving revision 1.2
diff -u -p -r1.2 io_unknown.h
--- include/asm-sh/io_unknown.h 2000/08/01 03:18:39 1.2
+++ include/asm-sh/io_unknown.h 2000/10/27 02:25:45
@@ -43,7 +43,6 @@ extern void unknown_writel(unsigned int
extern unsigned long unknown_isa_port2addr(unsigned long offset);
extern void * unknown_ioremap(unsigned long offset, unsigned long size);
-extern void * unknown_ioremap_nocache (unsigned long offset, unsigned long size);
extern void unknown_iounmap(void *addr);
#ifdef __WANT_IO_DEF
@@ -78,7 +77,6 @@ extern void unknown_iounmap(void *addr);
# define __isa_port2addr unknown_isa_port2addr
# define __ioremap unknown_ioremap
-# define __ioremap_nocache unknown_ioremap_nocache
# define __iounmap unknown_iounmap
#endif
Index: include/asm-sh/machvec.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/machvec.h,v
retrieving revision 1.3
diff -u -p -r1.3 machvec.h
--- include/asm-sh/machvec.h 2000/10/12 07:29:21 1.3
+++ include/asm-sh/machvec.h 2000/10/27 02:25:45
@@ -48,7 +48,6 @@ struct sh_machine_vector
void (*mv_writel)(unsigned int, unsigned long);
void* (*mv_ioremap)(unsigned long offset, unsigned long size);
- void* (*mv_ioremap_nocache)(unsigned long offset, unsigned long size);
void (*mv_iounmap)(void *addr);
unsigned long (*mv_port2addr)(unsigned long offset);
--
|
