Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=55eec11a50f4c5f53421f49e407e2c92cf25c3ca Commit: 55eec11a50f4c5f53421f49e407e2c92cf25c3ca Parent: 313887507f8ab9240d7b409c9e5ef2c75ac8e1fc Author: Yoshinori Sato <[EMAIL PROTECTED]> AuthorDate: Fri Dec 8 14:47:02 2006 +0900 Committer: Paul Mundt <[EMAIL PROTECTED]> CommitDate: Tue Dec 12 08:42:08 2006 +0900
sh: Kill off unused SE7619 I/O ops. This can use the generic routines, so kill off the board-specific ones. Signed-off-by: Yoshinori Sato <[EMAIL PROTECTED]> Signed-off-by: Paul Mundt <[EMAIL PROTECTED]> --- arch/sh/boards/se/7619/Makefile | 2 +- arch/sh/boards/se/7619/io.c | 102 --------------------------------------- arch/sh/boards/se/7619/setup.c | 21 -------- 3 files changed, 1 insertions(+), 124 deletions(-) diff --git a/arch/sh/boards/se/7619/Makefile b/arch/sh/boards/se/7619/Makefile index 3666eca..d21775c 100644 --- a/arch/sh/boards/se/7619/Makefile +++ b/arch/sh/boards/se/7619/Makefile @@ -2,4 +2,4 @@ # Makefile for the 7619 SolutionEngine specific parts of the kernel # -obj-y := setup.o io.o +obj-y := setup.o diff --git a/arch/sh/boards/se/7619/io.c b/arch/sh/boards/se/7619/io.c deleted file mode 100644 index 2f105c3..0000000 --- a/arch/sh/boards/se/7619/io.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * - * linux/arch/sh/boards/se/7619/io.c - * - * Copyright (C) 2006 Yoshinori Sato - * - * I/O routine for Hitachi 7619 SolutionEngine. - * - */ - -#include <linux/kernel.h> -#include <linux/types.h> -#include <asm/io.h> -#include <asm/se7619.h> -#include <asm/irq.h> - -/* FIXME: M3A-ZAB7 Compact Flash Slot support */ - -static inline void delay(void) -{ - ctrl_inw(0xa0000000); /* Uncached ROM area (P2) */ -} - -#define badio(name,port) \ - printk("bad I/O operation (%s) for port 0x%lx at 0x%08x\n", \ - #name, (port), (__u32) __builtin_return_address(0)) - -unsigned char se7619_inb(unsigned long port) -{ - badio(inb, port); - return 0; -} - -unsigned char se7619_inb_p(unsigned long port) -{ - badio(inb_p, port); - delay(); - return 0; -} - -unsigned short se7619_inw(unsigned long port) -{ - badio(inw, port); - return 0; -} - -unsigned int se7619_inl(unsigned long port) -{ - badio(inl, port); - return 0; -} - -void se7619_outb(unsigned char value, unsigned long port) -{ - badio(outb, port); -} - -void se7619_outb_p(unsigned char value, unsigned long port) -{ - badio(outb_p, port); - delay(); -} - -void se7619_outw(unsigned short value, unsigned long port) -{ - badio(outw, port); -} - -void se7619_outl(unsigned int value, unsigned long port) -{ - badio(outl, port); -} - -void se7619_insb(unsigned long port, void *addr, unsigned long count) -{ - badio(inw, port); -} - -void se7619_insw(unsigned long port, void *addr, unsigned long count) -{ - badio(inw, port); -} - -void se7619_insl(unsigned long port, void *addr, unsigned long count) -{ - badio(insl, port); -} - -void se7619_outsb(unsigned long port, const void *addr, unsigned long count) -{ - badio(insl, port); -} - -void se7619_outsw(unsigned long port, const void *addr, unsigned long count) -{ - badio(insl, port); -} - -void se7619_outsl(unsigned long port, const void *addr, unsigned long count) -{ - badio(outsw, port); -} diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/se/7619/setup.c index d1b516e..52d2c4d 100644 --- a/arch/sh/boards/se/7619/setup.c +++ b/arch/sh/boards/se/7619/setup.c @@ -8,7 +8,6 @@ #include <linux/init.h> #include <linux/platform_device.h> -#include <asm/se7619.h> #include <asm/io.h> #include <asm/machvec.h> @@ -19,25 +18,5 @@ struct sh_machine_vector mv_se __initmv = { .mv_name = "SolutionEngine", .mv_nr_irqs = 108, - .mv_inb = se7619_inb, - .mv_inw = se7619_inw, - .mv_inl = se7619_inl, - .mv_outb = se7619_outb, - .mv_outw = se7619_outw, - .mv_outl = se7619_outl, - - .mv_inb_p = se7619_inb_p, - .mv_inw_p = se7619_inw, - .mv_inl_p = se7619_inl, - .mv_outb_p = se7619_outb_p, - .mv_outw_p = se7619_outw, - .mv_outl_p = se7619_outl, - - .mv_insb = se7619_insb, - .mv_insw = se7619_insw, - .mv_insl = se7619_insl, - .mv_outsb = se7619_outsb, - .mv_outsw = se7619_outsw, - .mv_outsl = se7619_outsl, }; ALIAS_MV(se) - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html