Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d6e4702 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC]: Make sure dev_archdata is filled in for all devices. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e865f3e6

arch/sparc/kernel/ebus.c

+5 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d 
{

	const struct linux_prom_registers *regs;

	struct linux_ebus_child *child;

	struct dev_archdata *sd;

	const int *irqs;

	int i, n, len;

	unsigned long baseaddr;
@@ -234,6 +235,10 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d 
		}

	}



	sd = &dev->ofdev.dev.archdata;

	sd->prom_node = dp;

	sd->op = &dev->ofdev;



	dev->ofdev.node = dp;

	dev->ofdev.dev.parent = &dev->bus->ofdev.dev;

	dev->ofdev.dev.bus = &ebus_bus_type;

arch/sparc/kernel/of_device.c

+5 −0
Original line number Diff line number Diff line
@@ -420,11 +420,16 @@ static struct of_device * __init scan_one_device(struct device_node *dp, 
{

	struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL);

	const struct linux_prom_irqs *intr;

	struct dev_archdata *sd;

	int len, i;



	if (!op)

		return NULL;



	sd = &op->dev.archdata;

	sd->prom_node = dp;

	sd->op = op;



	op->node = dp;



	op->clock_freq = of_getintprop_default(dp, "clock-frequency",

arch/sparc64/kernel/ebus.c

+5 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ static int __init child_regs_nonstandard(struct linux_ebus_device *dev) 
static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)

{

	struct linux_ebus_child *child;

	struct dev_archdata *sd;

	struct of_device *op;

	int i, len;
@@ -387,6 +388,10 @@ static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_de 
			dev->irqs[i] = op->irqs[i];

	}



	sd = &dev->ofdev.dev.archdata;

	sd->prom_node = dp;

	sd->op = &dev->ofdev;



	dev->ofdev.node = dp;

	dev->ofdev.dev.parent = &dev->bus->ofdev.dev;

	dev->ofdev.dev.bus = &ebus_bus_type;

arch/sparc64/kernel/isa.c

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br) 


	while (dp) {

		struct sparc_isa_device *isa_dev;

		struct dev_archdata *sd;



		isa_dev = kzalloc(sizeof(*isa_dev), GFP_KERNEL);

		if (!isa_dev) {
@@ -86,6 +87,10 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br) 
			return;

		}



		sd = &isa_dev->ofdev.dev.archdata;

		sd->prom_node = dp;

		sd->op = &isa_dev->ofdev;



		isa_dev->ofdev.node = dp;

		isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;

		isa_dev->ofdev.dev.bus = &isa_bus_type;

arch/sparc64/kernel/of_device.c

+5 −0
Original line number Diff line number Diff line
@@ -752,11 +752,16 @@ static struct of_device * __init scan_one_device(struct device_node *dp, 
{

	struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL);

	const unsigned int *irq;

	struct dev_archdata *sd;

	int len, i;



	if (!op)

		return NULL;



	sd = &op->dev.archdata;

	sd->prom_node = dp;

	sd->op = op;



	op->node = dp;



	op->clock_freq = of_getintprop_default(dp, "clock-frequency",