evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sh: Remove sh_pcic_io_xxx function from Solution Engine IO code

Browse source 
sh_pcic_io_xxx function are very old.
In linux-2.4, mrshpc_ss socket driver used this function.
But there is not this driver to the present kernel.
I deleted these cords and checked operation.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Nobuhiro Iwamatsu 2008-06-24 13:00:52 +09:00 • committed by Paul Mundt
parent 7c93d87d09
commit fafb7a97de
1 changed files with 14 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
arch/sh/boards/se/770x/io.c
View file

@ -1,25 +1,13 @@
/* $Id: io.c,v 1.7 2006/02/05 21:55:29 lethal Exp $ /*
*
* linux/arch/sh/kernel/io_se.c
*
* Copyright (C) 2000 Kazumoto Kojima * Copyright (C) 2000 Kazumoto Kojima
* *
* I/O routine for Hitachi SolutionEngine. * I/O routine for Hitachi SolutionEngine.
*
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/se.h> #include <asm/se.h>
/* SH pcmcia io window base, start and end. */
int sh_pcic_io_wbase = 0xb8400000;
int sh_pcic_io_start;
int sh_pcic_io_stop;
int sh_pcic_io_type;
int sh_pcic_io_dummy;
/* MS7750 requires special versions of in*, out* routines, since /* MS7750 requires special versions of in*, out* routines, since
PC-like io ports are located at upper half byte of 16-bit word which PC-like io ports are located at upper half byte of 16-bit word which
can be accessed only with 16-bit wide. */ can be accessed only with 16-bit wide. */
@ -33,8 +21,6 @@ port2adr(unsigned int port)
return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000)); return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
else if (port >= 0x1000) else if (port >= 0x1000)
return (volatile __u16 *) (PA_83902 + (port << 1)); return (volatile __u16 *) (PA_83902 + (port << 1));
else if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
return (volatile __u16 *) (sh_pcic_io_wbase + (port &~ 1));
else else
return (volatile __u16 *) (PA_SUPERIO + (port << 1)); return (volatile __u16 *) (PA_SUPERIO + (port << 1));
} }
@ -51,32 +37,27 @@ shifted_port(unsigned long port)
unsigned char se_inb(unsigned long port) unsigned char se_inb(unsigned long port)
{ {
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) if (shifted_port(port))
return *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port); return (*port2adr(port) >> 8);
else if (shifted_port(port))
return (*port2adr(port) >> 8);
else else
return (*port2adr(port))&0xff; return (*port2adr(port))&0xff;
} }
unsigned char se_inb_p(unsigned long port) unsigned char se_inb_p(unsigned long port)
{ {
unsigned long v; unsigned long v;
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) if (shifted_port(port))
v = *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port); v = (*port2adr(port) >> 8);
else if (shifted_port(port))
v = (*port2adr(port) >> 8);
else else
v = (*port2adr(port))&0xff; v = (*port2adr(port))&0xff;
ctrl_delay(); ctrl_delay();
return v; return v;
} }
unsigned short se_inw(unsigned long port) unsigned short se_inw(unsigned long port)
{ {
if (port >= 0x2000 || if (port >= 0x2000)
(sh_pcic_io_start <= port && port <= sh_pcic_io_stop))
return *port2adr(port); return *port2adr(port);
else else
maybebadio(port); maybebadio(port);
@ -91,9 +72,7 @@ unsigned int se_inl(unsigned long port)
void se_outb(unsigned char value, unsigned long port) void se_outb(unsigned char value, unsigned long port)
{ {
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) if (shifted_port(port))
*(__u8 *)(sh_pcic_io_wbase + port) = value;
else if (shifted_port(port))
*(port2adr(port)) = value << 8; *(port2adr(port)) = value << 8;
else else
*(port2adr(port)) = value; *(port2adr(port)) = value;
@ -101,9 +80,7 @@ void se_outb(unsigned char value, unsigned long port)
void se_outb_p(unsigned char value, unsigned long port) void se_outb_p(unsigned char value, unsigned long port)
{ {
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) if (shifted_port(port))
*(__u8 *)(sh_pcic_io_wbase + port) = value;
else if (shifted_port(port))
*(port2adr(port)) = value << 8; *(port2adr(port)) = value << 8;
else else
*(port2adr(port)) = value; *(port2adr(port)) = value;
@ -112,8 +89,7 @@ void se_outb_p(unsigned char value, unsigned long port)
void se_outw(unsigned short value, unsigned long port) void se_outw(unsigned short value, unsigned long port)
{ {
if (port >= 0x2000 || if (port >= 0x2000)
(sh_pcic_io_start <= port && port <= sh_pcic_io_stop))
*port2adr(port) = value; *port2adr(port) = value;
else else
maybebadio(port); maybebadio(port);
@ -129,11 +105,7 @@ void se_insb(unsigned long port, void *addr, unsigned long count)
volatile __u16 *p = port2adr(port); volatile __u16 *p = port2adr(port);
__u8 *ap = addr; __u8 *ap = addr;
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) { if (shifted_port(port)) {
volatile __u8 *bp = (__u8 *) (sh_pcic_io_wbase + 0x40000 + port);
while (count--)
*ap++ = *bp;
} else if (shifted_port(port)) {
while (count--) while (count--)
*ap++ = *p >> 8; *ap++ = *p >> 8;
} else { } else {
@ -160,11 +132,7 @@ void se_outsb(unsigned long port, const void *addr, unsigned long count)
volatile __u16 *p = port2adr(port); volatile __u16 *p = port2adr(port);
const __u8 *ap = addr; const __u8 *ap = addr;
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) { if (shifted_port(port)) {
volatile __u8 *bp = (__u8 *) (sh_pcic_io_wbase + port);
while (count--)
*bp = *ap++;
} else if (shifted_port(port)) {
while (count--) while (count--)
*p = *ap++ << 8; *p = *ap++ << 8;
} else { } else {
@ -177,6 +145,7 @@ void se_outsw(unsigned long port, const void *addr, unsigned long count)
{ {
volatile __u16 *p = port2adr(port); volatile __u16 *p = port2adr(port);
const __u16 *ap = addr; const __u16 *ap = addr;
while (count--) while (count--)
*p = *ap++; *p = *ap++;
} }