[PATCH] PowerMac: Update for removal of device->name

From: Benjamin Herrenschmidt
Date: Sat Aug 16 2003 - 11:58:30 EST


Hi Linus !

This patch fix build of PowerMac driver core with the removal
of struct device "name" field. Please apply. It doesn't depend
not breaks the other pending PowerMac patches.

Ben.

===== arch/ppc/syslib/of_device.c 1.1 vs edited =====
--- 1.1/arch/ppc/syslib/of_device.c Sat Aug 9 18:40:04 2003
+++ edited/arch/ppc/syslib/of_device.c Sat Aug 16 18:48:20 2003
@@ -227,8 +227,6 @@
dev->dev.parent = NULL;
dev->dev.bus = &of_platform_bus_type;

- /* XXX Make something better here ? */
- snprintf(dev->dev.name, DEVICE_NAME_SIZE, "Platform device %s", np->name);
reg = (u32 *)get_property(np, "reg", NULL);
strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);

===== drivers/macintosh/macio_asic.c 1.1 vs edited =====
--- 1.1/drivers/macintosh/macio_asic.c Sat Aug 9 18:40:04 2003
+++ edited/drivers/macintosh/macio_asic.c Sat Aug 16 18:47:51 2003
@@ -141,9 +141,6 @@
dev->ofdev.dev.parent = parent;
dev->ofdev.dev.bus = &macio_bus_type;

- /* XXX Make something better here ? */
- snprintf(dev->ofdev.dev.name, DEVICE_NAME_SIZE, "MacIO device %s", np->name);
-
/* MacIO itself has a different reg, we use it's PCI base */
if (np == chip->of_node) {
sprintf(dev->ofdev.dev.bus_id, "%1d.%08lx:%.8s", chip->lbus.index,

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/