From c6e5f661eee0ff62e7fdb263cfeee73c20dd6e99 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 27 Aug 2008 04:18:02 -0700 Subject: sparc: Kill OBP property members of sbus_dev and sbus_bus Unused. Signed-off-by: David S. Miller --- arch/sparc/include/asm/sbus_32.h | 6 ------ arch/sparc/include/asm/sbus_64.h | 7 ------- drivers/sbus/sbus.c | 18 +----------------- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/arch/sparc/include/asm/sbus_32.h b/arch/sparc/include/asm/sbus_32.h index fdaf1a74492a..99f79e4a7094 100644 --- a/arch/sparc/include/asm/sbus_32.h +++ b/arch/sparc/include/asm/sbus_32.h @@ -30,9 +30,6 @@ struct sbus_dev { struct sbus_dev *next; struct sbus_dev *child; struct sbus_dev *parent; - int prom_node; - char prom_name[64]; - int slot; }; #define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev) @@ -41,9 +38,6 @@ struct sbus_bus { struct of_device ofdev; struct sbus_dev *devices; /* Link to devices on this SBus */ struct sbus_bus *next; /* next SBus, if more than one SBus */ - int prom_node; /* PROM device tree node for this SBus */ - char prom_name[64]; /* Usually "sbus" or "sbi" */ - int clock_freq; }; #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) diff --git a/arch/sparc/include/asm/sbus_64.h b/arch/sparc/include/asm/sbus_64.h index 6b3b055fca71..b7b76945247f 100644 --- a/arch/sparc/include/asm/sbus_64.h +++ b/arch/sparc/include/asm/sbus_64.h @@ -30,9 +30,6 @@ struct sbus_dev { struct sbus_dev *next; struct sbus_dev *child; struct sbus_dev *parent; - int prom_node; - char prom_name[64]; - int slot; }; #define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev) @@ -41,10 +38,6 @@ struct sbus_bus { struct of_device ofdev; struct sbus_dev *devices; /* Tree of SBUS devices */ struct sbus_bus *next; /* Next SBUS in system */ - int prom_node; /* OBP node of SBUS */ - char prom_name[64]; /* Usually "sbus" or "sbi" */ - int clock_freq; - int portid; }; #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 3b30f9995129..64c3e45875ff 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c @@ -51,9 +51,6 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde struct dev_archdata *sd; int err; - sdev->prom_node = dp->node; - strcpy(sdev->prom_name, dp->name); - sd = &sdev->ofdev.dev.archdata; sd->prom_node = dp; sd->op = &sdev->ofdev; @@ -107,30 +104,17 @@ static void __init walk_children(struct device_node *dp, struct sbus_dev *parent static void __init build_one_sbus(struct device_node *dp, int num_sbus) { - struct sbus_bus *sbus; - unsigned int sbus_clock; struct device_node *dev_dp; + struct sbus_bus *sbus; sbus = kzalloc(sizeof(struct sbus_bus), GFP_ATOMIC); if (!sbus) return; - sbus->prom_node = dp->node; - sbus_setup_iommu(sbus, dp); printk("sbus%d: ", num_sbus); - sbus_clock = of_getintprop_default(dp, "clock-frequency", - (25*1000*1000)); - sbus->clock_freq = sbus_clock; - - printk("Clock %d.%d MHz\n", (int) ((sbus_clock/1000)/1000), - (int) (((sbus_clock/1000)%1000 != 0) ? - (((sbus_clock/1000)%1000) + 1000) : 0)); - - strcpy(sbus->prom_name, dp->name); - sbus->ofdev.node = dp; sbus->ofdev.dev.parent = NULL; sbus->ofdev.dev.bus = &sbus_bus_type; -- cgit v1.2.2