lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] clean up ide io accessors

Browse Source 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
This commit is contained in:
Stephen Rothwell
2006-09-19 17:30:20 +10:00
parent 661f1cdb8b
commit 73ea9e1bcb
6 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/kernel/misc.S
View File

@@ -86,9 +86,6 @@ _GLOBAL(_outsb)
sync sync
blr blr
#ifdef CONFIG_PPC32
_GLOBAL(__ide_mm_insw)
#endif
_GLOBAL(_insw_ns) _GLOBAL(_insw_ns)
sync sync
cmpwi 0,r5,0 cmpwi 0,r5,0
@@ -103,9 +100,6 @@ _GLOBAL(_insw_ns)
isync isync
blr blr
#ifdef CONFIG_PPC32
_GLOBAL(__ide_mm_outsw)
#endif
_GLOBAL(_outsw_ns) _GLOBAL(_outsw_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5
@@ -118,9 +112,6 @@ _GLOBAL(_outsw_ns)
sync sync
blr blr
#ifdef CONFIG_PPC32
_GLOBAL(__ide_mm_insl)
#endif
_GLOBAL(_insl_ns) _GLOBAL(_insl_ns)
sync sync
cmpwi 0,r5,0 cmpwi 0,r5,0
@@ -135,9 +126,6 @@ _GLOBAL(_insl_ns)
isync isync
blr blr
#ifdef CONFIG_PPC32
_GLOBAL(__ide_mm_outsl)
#endif
_GLOBAL(_outsl_ns) _GLOBAL(_outsl_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5

7
arch/powerpc/kernel/ppc_ksyms.c
View File

@@ -95,13 +95,6 @@ EXPORT_SYMBOL(__strnlen_user);
EXPORT_SYMBOL(copy_4K_page); EXPORT_SYMBOL(copy_4K_page);
#endif #endif
#ifndef __powerpc64__
EXPORT_SYMBOL(__ide_mm_insl);
EXPORT_SYMBOL(__ide_mm_outsw);
EXPORT_SYMBOL(__ide_mm_insw);
EXPORT_SYMBOL(__ide_mm_outsl);
#endif
EXPORT_SYMBOL(_insb); EXPORT_SYMBOL(_insb);
EXPORT_SYMBOL(_outsb); EXPORT_SYMBOL(_outsb);
EXPORT_SYMBOL(_insw_ns); EXPORT_SYMBOL(_insw_ns);

4
arch/ppc/kernel/misc.S
View File

@@ -768,7 +768,6 @@ _GLOBAL(_outsb)
bdnz 00b bdnz 00b
blr blr
_GLOBAL(__ide_mm_insw)
_GLOBAL(_insw_ns) _GLOBAL(_insw_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5
@@ -790,7 +789,6 @@ _GLOBAL(_insw_ns)
bdnz 00b bdnz 00b
blr blr
_GLOBAL(__ide_mm_outsw)
_GLOBAL(_outsw_ns) _GLOBAL(_outsw_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5
@@ -812,7 +810,6 @@ _GLOBAL(_outsw_ns)
bdnz 00b bdnz 00b
blr blr
_GLOBAL(__ide_mm_insl)
_GLOBAL(_insl_ns) _GLOBAL(_insl_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5
@@ -834,7 +831,6 @@ _GLOBAL(_insl_ns)
bdnz 00b bdnz 00b
blr blr
_GLOBAL(__ide_mm_outsl)
_GLOBAL(_outsl_ns) _GLOBAL(_outsl_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5

5
arch/ppc/kernel/ppc_ksyms.c
View File

@@ -115,11 +115,6 @@ EXPORT_SYMBOL(outw);
EXPORT_SYMBOL(outl); EXPORT_SYMBOL(outl);
EXPORT_SYMBOL(outsl);*/ EXPORT_SYMBOL(outsl);*/
EXPORT_SYMBOL(__ide_mm_insl);
EXPORT_SYMBOL(__ide_mm_outsw);
EXPORT_SYMBOL(__ide_mm_insw);
EXPORT_SYMBOL(__ide_mm_outsl);
EXPORT_SYMBOL(_insb); EXPORT_SYMBOL(_insb);
EXPORT_SYMBOL(_outsb); EXPORT_SYMBOL(_outsb);
EXPORT_SYMBOL(_insw_ns); EXPORT_SYMBOL(_insw_ns);

12
include/asm-powerpc/ide.h
View File

@@ -12,6 +12,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/mpc8xx.h> #include <asm/mpc8xx.h>
#endif #endif
#include <asm/io.h>
#ifndef MAX_HWIFS #ifndef MAX_HWIFS
#ifdef __powerpc64__ #ifdef __powerpc64__
@@ -21,15 +22,14 @@
#endif #endif
#endif #endif
#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
#ifndef __powerpc64__ #ifndef __powerpc64__
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <asm/io.h>
extern void __ide_mm_insw(void __iomem *port, void *addr, u32 count);
extern void __ide_mm_outsw(void __iomem *port, void *addr, u32 count);
extern void __ide_mm_insl(void __iomem *port, void *addr, u32 count);
extern void __ide_mm_outsl(void __iomem *port, void *addr, u32 count);
struct ide_machdep_calls { struct ide_machdep_calls {
int (*default_irq)(unsigned long base); int (*default_irq)(unsigned long base);

6
include/asm-powerpc/io.h
View File

@@ -28,12 +28,6 @@ extern int check_legacy_ioport(unsigned long base_port);
#include <asm-generic/iomap.h> #include <asm-generic/iomap.h>
#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
#define SIO_CONFIG_RA 0x398 #define SIO_CONFIG_RA 0x398
#define SIO_CONFIG_RD 0x399 #define SIO_CONFIG_RD 0x399