diff options
Diffstat (limited to 'arch/sh/boards/mach-titan/io.c')
| -rw-r--r-- | arch/sh/boards/mach-titan/io.c | 20 | 
1 files changed, 1 insertions, 19 deletions
diff --git a/arch/sh/boards/mach-titan/io.c b/arch/sh/boards/mach-titan/io.c index 4badad4c6f3..0130e9826ac 100644 --- a/arch/sh/boards/mach-titan/io.c +++ b/arch/sh/boards/mach-titan/io.c @@ -17,8 +17,6 @@ u8 titan_inb(unsigned long port)  {          if (PXSEG(port))                  return ctrl_inb(port); -        else if (is_pci_ioaddr(port)) -                return ctrl_inb(pci_ioaddr(port));          return ctrl_inw(port2adr(port)) & 0xff;  } @@ -28,8 +26,6 @@ u8 titan_inb_p(unsigned long port)          if (PXSEG(port))                  v = ctrl_inb(port); -        else if (is_pci_ioaddr(port)) -                v = ctrl_inb(pci_ioaddr(port));          else                  v = ctrl_inw(port2adr(port)) & 0xff;          ctrl_delay(); @@ -40,8 +36,6 @@ u16 titan_inw(unsigned long port)  {          if (PXSEG(port))                  return ctrl_inw(port); -        else if (is_pci_ioaddr(port)) -                return ctrl_inw(pci_ioaddr(port));          else if (port >= 0x2000)                  return ctrl_inw(port2adr(port));          else @@ -53,8 +47,6 @@ u32 titan_inl(unsigned long port)  {          if (PXSEG(port))                  return ctrl_inl(port); -        else if (is_pci_ioaddr(port)) -                return ctrl_inl(pci_ioaddr(port));          else if (port >= 0x2000)                  return ctrl_inw(port2adr(port));          else @@ -66,8 +58,6 @@ void titan_outb(u8 value, unsigned long port)  {          if (PXSEG(port))                  ctrl_outb(value, port); -        else if (is_pci_ioaddr(port)) -                ctrl_outb(value, pci_ioaddr(port));          else                  ctrl_outw(value, port2adr(port));  } @@ -76,8 +66,6 @@ void titan_outb_p(u8 value, unsigned long port)  {          if (PXSEG(port))                  ctrl_outb(value, port); -        else if (is_pci_ioaddr(port)) -                ctrl_outb(value, pci_ioaddr(port));          else                  ctrl_outw(value, port2adr(port));          ctrl_delay(); @@ -87,8 +75,6 @@ void titan_outw(u16 value, unsigned long port)  {          if (PXSEG(port))                  ctrl_outw(value, port); -        else if (is_pci_ioaddr(port)) -                ctrl_outw(value, pci_ioaddr(port));          else if (port >= 0x2000)                  ctrl_outw(value, port2adr(port));          else @@ -99,8 +85,6 @@ void titan_outl(u32 value, unsigned long port)  {          if (PXSEG(port))                  ctrl_outl(value, port); -        else if (is_pci_ioaddr(port)) -                ctrl_outl(value, pci_ioaddr(port));          else                  maybebadio(port);  } @@ -117,10 +101,8 @@ void titan_outsl(unsigned long port, const void *src, unsigned long count)  void __iomem *titan_ioport_map(unsigned long port, unsigned int size)  { -	if (PXSEG(port) || is_pci_memaddr(port)) +	if (PXSEG(port))  		return (void __iomem *)port; -	else if (is_pci_ioaddr(port)) -		return (void __iomem *)pci_ioaddr(port);  	return (void __iomem *)port2adr(port);  }  |