Skip to content

Commit

Permalink
sparc: Kill OBP property members of sbus_dev and sbus_bus
Browse files Browse the repository at this point in the history
Unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Aug 29, 2008
1 parent 9b9644c commit c6e5f66
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 30 deletions.
6 changes: 0 additions & 6 deletions arch/sparc/include/asm/sbus_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
7 changes: 0 additions & 7 deletions arch/sparc/include/asm/sbus_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
18 changes: 1 addition & 17 deletions drivers/sbus/sbus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c6e5f66

Please sign in to comment.