Skip to contentSkip to conversation

PowerMac: Update for removal of device->name

PATCH New Benjamin Herrenschmidt 1 participant 1 message Aug 16, 2003 Linux for power macintosh

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PowerMac: Update for removal of device->name

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 =====

arch/ppc/syslib/of_device.c +0 -2
@@ -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 =====

drivers/macintosh/macio_asic.c +0 -3
@@ -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,