Skip to contentSkip to conversation

sh: remove voyagergx

PATCH In review Magnus Damm 3 participants 4 messages Jan 13, 2008 – Jan 14, 2008 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: remove voyagergx

sh: remove voyagergx

This patch removes redundant irq handling code together with unused consistent alloc code. R2D uart setup code is changed to use sm501-regs.h and unused header files are removed.

---

 arch/sh/Makefile                          |    1 
 arch/sh/boards/renesas/rts7751r2d/irq.c   |    4 
 arch/sh/boards/renesas/rts7751r2d/setup.c |   73 +++---
 arch/sh/cchips/voyagergx/Makefile         |    9 
 arch/sh/cchips/voyagergx/consistent.c     |  121 ----------
 arch/sh/cchips/voyagergx/irq.c            |  101 --------
 include/asm-sh/voyagergx.h                |  341 -----------------------------
 7 files changed, 39 insertions(+), 611 deletions(-)
arch/sh/Makefile +0 -1
@@ -138,7 +138,6 @@ endif
 
 # Companion chips
 core-$(CONFIG_HD6446X_SERIES)	+= arch/sh/cchips/hd6446x/
-core-$(CONFIG_MFD_SM501)	+= arch/sh/cchips/voyagergx/
 
 cpuincdir-$(CONFIG_CPU_SH2)	:= cpu-sh2
 cpuincdir-$(CONFIG_CPU_SH2A)	:= cpu-sh2a
arch/sh/boards/renesas/rts7751r2d/irq.c +0 -4
@@ -13,7 +13,6 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <asm/voyagergx.h>
 #include <asm/rts7751r2d.h>
 
 #define R2D_NR_IRL 13
@@ -153,7 +152,4 @@ void __init init_rts7751r2d_IRQ(void)
 	}
 
 	register_intc_controller(d);
-#ifdef CONFIG_MFD_SM501
-	setup_voyagergx_irq();
-#endif
 }
arch/sh/boards/renesas/rts7751r2d/setup.c +39 -34

121 lines not on this page · raw message

arch/sh/cchips/voyagergx/Makefile deleted +0 -9
@@ -1,9 +0,0 @@
-#
-# Makefile for VoyagerGX
-#
-
-obj-y	:= irq.o setup.o
-
-obj-$(CONFIG_USB_OHCI_HCD)	+= consistent.o
-
-EXTRA_CFLAGS += -Werror
arch/sh/cchips/voyagergx/consistent.c deleted +0 -121

121 lines not on this page · raw message

arch/sh/cchips/voyagergx/irq.c deleted +0 -101

101 lines not on this page · raw message

include/asm-sh/voyagergx.h deleted +0 -341

341 lines not on this page · raw message

#1 lore raw
Quoted 9 lines · Magnus Damm

sh: remove voyagergx

This patch removes redundant irq handling code together with unused consistent alloc code. R2D uart setup code is changed to use sm501-regs.h and unused header files are removed.

---

Quoted 9 lines
 arch/sh/Makefile                          |    1 
 arch/sh/boards/renesas/rts7751r2d/irq.c   |    4 
 arch/sh/boards/renesas/rts7751r2d/setup.c |   73 +++---
 arch/sh/cchips/voyagergx/Makefile         |    9 
 arch/sh/cchips/voyagergx/consistent.c     |  121 ----------
 arch/sh/cchips/voyagergx/irq.c            |  101 --------
 include/asm-sh/voyagergx.h                |  341 -----------------------------
 7 files changed, 39 insertions(+), 611 deletions(-)

Nice, this code has been crap for longer than I can remember (either a testament to how long this code has sucked or that my memory isn't very good, either way), it's good to finally be rid of it. Now if only we could move the hd64461x atrocity in to drivers/mfd, we can be rid of arch/sh/cchips/ entirely.

#2 lore raw
In reply to Magnus Damm
Quoted 19 lines · On Mon, 14 Jan 2008 01:35:16 +0900 Paul Mundt <[email protected]> wrote:
Quoted 9 lines · Magnus Damm

sh: remove voyagergx

This patch removes redundant irq handling code together with unused consistent alloc code. R2D uart setup code is changed to use sm501-regs.h and unused header files are removed.

---

Quoted 9 lines
 arch/sh/Makefile                          |    1 
 arch/sh/boards/renesas/rts7751r2d/irq.c   |    4 
 arch/sh/boards/renesas/rts7751r2d/setup.c |   73 +++---
 arch/sh/cchips/voyagergx/Makefile         |    9 
 arch/sh/cchips/voyagergx/consistent.c     |  121 ----------
 arch/sh/cchips/voyagergx/irq.c            |  101 --------
 include/asm-sh/voyagergx.h                |  341 -----------------------------
 7 files changed, 39 insertions(+), 611 deletions(-)
Quoted 5 lines

Nice, this code has been crap for longer than I can remember (either a testament to how long this code has sucked or that my memory isn't very good, either way), it's good to finally be rid of it. Now if only we could move the hd64461x atrocity in to drivers/mfd, we can be rid of arch/sh/cchips/ entirely.

Hey! I've just spent a couple of hours merging hd64461 & hd64465 into hd6446x, and now you tell me you want to rip it out :D

Quoted 4 lines

-
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line
Kristoffer Ericson <[email protected]>
#3 lore raw
In reply to Magnus Damm
Quoted 22 lines · Kristoffer Ericson
Quoted 19 lines · On Mon, 14 Jan 2008 01:35:16 +0900 Paul Mundt <[email protected]> wrote:
Quoted 18 lines · Magnus Damm

sh: remove voyagergx

This patch removes redundant irq handling code together with unused consistent alloc code. R2D uart setup code is changed to use sm501-regs.h and unused header files are removed.

---

 arch/sh/Makefile                          |    1 
 arch/sh/boards/renesas/rts7751r2d/irq.c   |    4 
 arch/sh/boards/renesas/rts7751r2d/setup.c |   73 +++---
 arch/sh/cchips/voyagergx/Makefile         |    9 
 arch/sh/cchips/voyagergx/consistent.c     |  121 ----------
 arch/sh/cchips/voyagergx/irq.c            |  101 --------
 include/asm-sh/voyagergx.h                |  341 -----------------------------
 7 files changed, 39 insertions(+), 611 deletions(-)
Quoted 9 lines
Quoted 5 lines

Nice, this code has been crap for longer than I can remember (either a testament to how long this code has sucked or that my memory isn't very good, either way), it's good to finally be rid of it. Now if only we could move the hd64461x atrocity in to drivers/mfd, we can be rid of arch/sh/cchips/ entirely.

Hey! I've just spent a couple of hours merging hd64461 & hd64465 into hd6446x, and now you tell me you want to rip it out :D

No, I want to move it somewhere sane and make it behave like the other MFD drivers. That's been the plan all along, it just hasn't happened yet.