sh: mach-se: Rip out superfluous 7751 PIO routines. (e2781ac2) · Commits · 戴 / test

arch/sh/boards/mach-se/7751/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,4 @@
		# Makefile for the 7751 SolutionEngine specific parts of the kernel
		#

		obj-y := setup.o io.o irq.o
		obj-y := setup.o irq.o

arch/sh/boards/mach-se/7751/io.c

deleted100644 → 0

+0 −119

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2001 Ian da Silva, Jeremy Siegel
		* Based largely on io_se.c.
		*
		* I/O routine for Hitachi 7751 SolutionEngine.
		*
		* Initial version only to support LAN access; some
		* placeholder code from io_se.c left in with the
		* expectation of later SuperIO and PCMCIA access.
		*/
		#include <linux/kernel.h>
		#include <linux/types.h>
		#include <linux/pci.h>
		#include <asm/io.h>
		#include <mach-se/mach/se7751.h>
		#include <asm/addrspace.h>

		static inline volatile u16 *port2adr(unsigned int port)
		{
		if (port >= 0x2000)
		return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
		maybebadio((unsigned long)port);
		return (volatile __u16*)port;
		}

		/*
		* General outline: remap really low stuff [eventually] to SuperIO,
		* stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
		* is mapped through the PCI IO window. Stuff with high bits (PXSEG)
		* should be way beyond the window, and is used w/o translation for
		* compatibility.
		*/
		unsigned char sh7751se_inb(unsigned long port)
		{
		if (PXSEG(port))
		return (volatile unsigned char )port;
		else
		return (*port2adr(port)) & 0xff;
		}

		unsigned char sh7751se_inb_p(unsigned long port)
		{
		unsigned char v;

		if (PXSEG(port))
		v = (volatile unsigned char )port;
		else
		v = (*port2adr(port)) & 0xff;
		ctrl_delay();
		return v;
		}

		unsigned short sh7751se_inw(unsigned long port)
		{
		if (PXSEG(port))
		return (volatile unsigned short )port;
		else if (port >= 0x2000)
		return *port2adr(port);
		else
		maybebadio(port);
		return 0;
		}

		unsigned int sh7751se_inl(unsigned long port)
		{
		if (PXSEG(port))
		return (volatile unsigned long )port;
		else if (port >= 0x2000)
		return *port2adr(port);
		else
		maybebadio(port);
		return 0;
		}

		void sh7751se_outb(unsigned char value, unsigned long port)
		{

		if (PXSEG(port))
		(volatile unsigned char )port = value;
		else
		*(port2adr(port)) = value;
		}

		void sh7751se_outb_p(unsigned char value, unsigned long port)
		{
		if (PXSEG(port))
		(volatile unsigned char )port = value;
		else
		*(port2adr(port)) = value;
		ctrl_delay();
		}

		void sh7751se_outw(unsigned short value, unsigned long port)
		{
		if (PXSEG(port))
		(volatile unsigned short )port = value;
		else if (port >= 0x2000)
		*port2adr(port) = value;
		else
		maybebadio(port);
		}

		void sh7751se_outl(unsigned int value, unsigned long port)
		{
		if (PXSEG(port))
		(volatile unsigned long )port = value;
		else
		maybebadio(port);
		}

		void sh7751se_insl(unsigned long port, void *addr, unsigned long count)
		{
		maybebadio(port);
		}

		void sh7751se_outsl(unsigned long port, const void *addr, unsigned long count)
		{
		maybebadio(port);
		}

arch/sh/boards/mach-se/7751/setup.c

+0 −18

Original line number	Diff line number	Diff line
		@@ -56,23 +56,5 @@ __initcall(se7751_devices_setup);
		static struct sh_machine_vector mv_7751se __initmv = {
		.mv_name = "7751 SolutionEngine",
		.mv_nr_irqs = 72,

		.mv_inb = sh7751se_inb,
		.mv_inw = sh7751se_inw,
		.mv_inl = sh7751se_inl,
		.mv_outb = sh7751se_outb,
		.mv_outw = sh7751se_outw,
		.mv_outl = sh7751se_outl,

		.mv_inb_p = sh7751se_inb_p,
		.mv_inw_p = sh7751se_inw,
		.mv_inl_p = sh7751se_inl,
		.mv_outb_p = sh7751se_outb_p,
		.mv_outw_p = sh7751se_outw,
		.mv_outl_p = sh7751se_outl,

		.mv_insl = sh7751se_insl,
		.mv_outsl = sh7751se_outsl,

		.mv_init_irq = init_7751se_IRQ,
		};

Admin message