sh: Kill off dead code for SE and SystemH boards.

Some of these have suffered some bitrot, and so there is
some degree of dead code that has been left sitting around,
clean it up..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/renesas/systemh/io.c b/arch/sh/boards/renesas/systemh/io.c
index cf979011aa943de88bda3d9d01daf0628706e4a0..85511576d414c3baf909323439aa1797a111b2ef 100644 (file)
--- a/arch/sh/boards/renesas/systemh/io.c
+++ b/arch/sh/boards/renesas/systemh/io.c
@@ -15,7 +15,7 @@
 #include <asm/io.h>
 
 #include <linux/pci.h>
-#include "../../drivers/pci/pci-sh7751.h"
+#include "../../../drivers/pci/pci-sh7751.h"
 
 /*
  * The 7751 SystemH Engine uses the built-in PCI controller (PCIC)

diff --git a/arch/sh/boards/se/73180/io.c b/arch/sh/boards/se/73180/io.c
index 755df5ac4a4e81c1d6c12341a60b79ec51a58ead..72715575458b81b2f217738d2fb6dd0df0bb8566 100644 (file)
--- a/arch/sh/boards/se/73180/io.c
+++ b/arch/sh/boards/se/73180/io.c
@@ -99,6 +99,7 @@ bad_outb(struct iop *p, unsigned char value, unsigned long port)
        badio(inw, port);
 }
 
+#ifdef CONFIG_SMC91X
 /* MSTLANEX01 LAN at 0xb400:0000 */
 static struct iop laniop = {
        .start = 0x300,
@@ -110,6 +111,7 @@ static struct iop laniop = {
        .outb = simple_outb,
        .outw = simple_outw,
 };
+#endif
 
 /* NE2000 pc card NIC */
 static struct iop neiop = {
@@ -123,6 +125,7 @@ static struct iop neiop = {
        .outw = simple_outw,
 };
 
+#ifdef CONFIG_IDE
 /* CF in CF slot */
 static struct iop cfiop = {
        .base = 0xb0600000,
@@ -132,12 +135,13 @@ static struct iop cfiop = {
        .outb = pcc_outb,
        .outw = simple_outw,
 };
+#endif
 
 static __inline__ struct iop *
 port2iop(unsigned long port)
 {
        if (0) ;
-#if defined(CONFIG_SMC91111)
+#if defined(CONFIG_SMC91X)
        else if (laniop.check(&laniop, port))
                return &laniop;
 #endif

diff --git a/arch/sh/boards/se/73180/irq.c b/arch/sh/boards/se/73180/irq.c
index 4344d0ef24aa05ea8845632e8996bb3d15f570c7..2c62b8ea350ee8e3d214ed9de51b31d920035f7a 100644 (file)
--- a/arch/sh/boards/se/73180/irq.c
+++ b/arch/sh/boards/se/73180/irq.c
@@ -7,7 +7,6 @@
  * Modified for SH-Mobile SolutionEngine 73180 Support
  *              by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
  *
- *
  */
 
 #include <linux/init.h>
@@ -16,14 +15,6 @@
 #include <asm/io.h>
 #include <asm/mach/se73180.h>
 
-static int
-intreq2irq(int i)
-{
-       if (i == 5)
-               return 10;
-       return 32 + 7 - i;
-}
-
 static int
 irq2intreq(int irq)
 {

diff --git a/arch/sh/boards/se/73180/led.c b/arch/sh/boards/se/73180/led.c
index 610439fde6ee5f3fc6ef7ece6e3be5455a41301f..4b72e9a3ead9ba7a1fa41739c72d6bd66fa275ae 100644 (file)
--- a/arch/sh/boards/se/73180/led.c
+++ b/arch/sh/boards/se/73180/led.c
@@ -14,21 +14,8 @@
 #include <linux/sched.h>
 #include <asm/mach/se73180.h>
 
-static void
-mach_led(int position, int value)
-{
-       volatile unsigned short *p = (volatile unsigned short *) PA_LED;
-
-       if (value) {
-               *p |= (1 << LED_SHIFT);
-       } else {
-               *p &= ~(1 << LED_SHIFT);
-       }
-}
-
 /* Cycle the LED's in the clasic Knightrider/Sun pattern */
-void
-heartbeat_73180se(void)
+void heartbeat_73180se(void)
 {
        static unsigned int cnt = 0, period = 0;
        volatile unsigned short *p = (volatile unsigned short *) PA_LED;

diff --git a/arch/sh/boards/se/770x/Makefile b/arch/sh/boards/se/770x/Makefile
index be89a73cc418aede40d3cbbfd0f2baec468b4352..c96ed6933fe1fad5eb8f72f4a3ef71e2a97dd49f 100644 (file)
--- a/arch/sh/boards/se/770x/Makefile
+++ b/arch/sh/boards/se/770x/Makefile
@@ -2,5 +2,6 @@
 # Makefile for the 770x SolutionEngine specific parts of the kernel
 #
 
-obj-y   := mach.o setup.o io.o irq.o led.o
+obj-y   := mach.o setup.o io.o irq.o
 
+obj-$(CONFIG_HEARTBEAT) += led.o

diff --git a/arch/sh/boards/se/770x/led.c b/arch/sh/boards/se/770x/led.c
index 3cddbda025fc28d1cd8b7ee431a49042b30199fd..73e9848387ea35ee84058ccb5516d238f3b31f5e 100644 (file)
--- a/arch/sh/boards/se/770x/led.c
+++ b/arch/sh/boards/se/770x/led.c
@@ -9,22 +9,8 @@
  * This file contains Solution Engine specific LED code.
  */
 
-#include <asm/se/se.h>
-
-static void mach_led(int position, int value)
-{
-       volatile unsigned short* p = (volatile unsigned short*)PA_LED;
-
-       if (value) {
-               *p |= (1<<8);
-       } else {
-               *p &= ~(1<<8);
-       }
-}
-
-#ifdef CONFIG_HEARTBEAT
-
 #include <linux/sched.h>
+#include <asm/se/se.h>
 
 /* Cycle the LED's in the clasic Knightrider/Sun pattern */
 void heartbeat_se(void)
@@ -64,4 +50,3 @@ void heartbeat_se(void)
        *p = 1<<(bit+8);
 
 }
-#endif /* CONFIG_HEARTBEAT */

diff --git a/arch/sh/boards/se/7751/Makefile b/arch/sh/boards/se/7751/Makefile
index ce7ca247f84d04dfbe722f689655eb39b56e1d72..07bf17a4a19bd820b9b153f6ded8f782d6e410a8 100644 (file)
--- a/arch/sh/boards/se/7751/Makefile
+++ b/arch/sh/boards/se/7751/Makefile
@@ -2,7 +2,8 @@
 # Makefile for the 7751 SolutionEngine specific parts of the kernel
 #
 
-obj-y   := mach.o setup.o io.o irq.o led.o
+obj-y   := mach.o setup.o io.o irq.o
 
 obj-$(CONFIG_PCI) += pci.o
+obj-$(CONFIG_HEARTBEAT) += led.o
 

diff --git a/arch/sh/boards/se/7751/led.c b/arch/sh/boards/se/7751/led.c
index a878726d3c7c8d5019be1d96bbc94cb0d496a20c..4405e26cf866c001b2d917470d6152875a7e62d0 100644 (file)
--- a/arch/sh/boards/se/7751/led.c
+++ b/arch/sh/boards/se/7751/led.c
@@ -10,20 +10,6 @@
  */
 
 #include <asm/se7751/se7751.h>
-
-static void mach_led(int position, int value)
-{
-       volatile unsigned short* p = (volatile unsigned short*)PA_LED;
-
-       if (value) {
-               *p |= (1<<8);
-       } else {
-               *p &= ~(1<<8);
-       }
-}
-
-#ifdef CONFIG_HEARTBEAT
-
 #include <linux/sched.h>
 
 /* Cycle the LED's in the clasic Knightrider/Sun pattern */
@@ -64,4 +50,3 @@ void heartbeat_7751se(void)
        *p = 1<<(bit+8);
 
 }
-#endif /* CONFIG_HEARTBEAT */