2.6.0-test3 current - firewire compile error

Hopefully, this is not a duplicate post:
===========================================

drivers/ieee1394/nodemgr.c: In function `nodemgr_update_ud_names':
drivers/ieee1394/nodemgr.c:471: error: structure has no member named `name'

Quoted 5 lines · Ivan Gyurdiev

Hopefully, this is not a duplicate post:
===========================================

drivers/ieee1394/nodemgr.c: In function `nodemgr_update_ud_names':
drivers/ieee1394/nodemgr.c:471: error: structure has no member named `name'

I got a similar error starting with last night's bk pull:

drivers/pnp/core.c: In function `pnp_register_protocol':
drivers/pnp/core.c:72: structure has no member named `name'

-

Quoted 12 lines · walt

Quoted 6 lines · Ivan Gyurdiev

Hopefully, this is not a duplicate post:
===========================================

drivers/ieee1394/nodemgr.c: In function `nodemgr_update_ud_names':
drivers/ieee1394/nodemgr.c:471: error: structure has no member named `name'

I got a similar error starting with last night's bk pull:

Quoted 4 lines

drivers/pnp/core.c: In function `pnp_register_protocol':
drivers/pnp/core.c:72: structure has no member named `name'

-

And I just got another one of those trying to compile the nvidia driver for this kernel. So apparently this is not firewire or pnp specific.

Quoted 5 lines · Ivan Gyurdiev

Hopefully, this is not a duplicate post:
===========================================

drivers/ieee1394/nodemgr.c: In function `nodemgr_update_ud_names':
drivers/ieee1394/nodemgr.c:471: error: structure has no member named `name'

I got a similar error starting with last night's bk pull:

drivers/pnp/core.c: In function `pnp_register_protocol':
drivers/pnp/core.c:72: structure has no member named `name'

Quoted 7 lines · walt

Quoted 5 lines · Ivan Gyurdiev

Hopefully, this is not a duplicate post:
===========================================

drivers/ieee1394/nodemgr.c: In function `nodemgr_update_ud_names':
drivers/ieee1394/nodemgr.c:471: error: structure has no member named `name'

Quoted 4 lines

I got a similar error starting with last night's bk pull:

drivers/pnp/core.c: In function `pnp_register_protocol':
drivers/pnp/core.c:72: structure has no member named `name'

Hm, I thought the pnp layer had already been fixed up.

Adam?

Quoted 4 lines · walt

Quoted 3 lines

drivers/pnp/core.c: In function `pnp_register_protocol':
drivers/pnp/core.c:72: structure has no member named `name'

I apoligize for forgetting to correct this. Here is a fix.

diff -urN a/drivers/pnp/core.c b/drivers/pnp/core.c

drivers/pnp/core.c +0 -1

@@ -69,7 +69,6 @@
 
 	protocol->number = nodenum;
 	sprintf(protocol->dev.bus_id, "pnp%d", nodenum);
-	strlcpy(protocol->dev.name,protocol->name,DEVICE_NAME_SIZE);
 	return device_register(&protocol->dev);
 }
 

diff -urN a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c

drivers/pnp/isapnp/core.c +4 -4

@@ -743,7 +743,7 @@
 			size = 0;
 			break;
 		case _LTAG_ANSISTR:
-			isapnp_parse_name(dev->dev.name, sizeof(dev->dev.name), &size);
+			isapnp_parse_name(dev->name, sizeof(dev->name), &size);
 			break;
 		case _LTAG_UNICODESTR:
 			/* silently ignore */

@@ -808,7 +808,7 @@
 		case _STAG_VENDOR:
 			break;
 		case _LTAG_ANSISTR:
-			isapnp_parse_name(card->dev.name, sizeof(card->dev.name), &size);
+			isapnp_parse_name(card->name, sizeof(card->name), &size);
 			break;
 		case _LTAG_UNICODESTR:
 			/* silently ignore */

@@ -1144,11 +1144,11 @@
 	protocol_for_each_card(&isapnp_protocol,card) {
 		cards++;
 		if (isapnp_verbose) {
-			printk(KERN_INFO "isapnp: Card '%s'\n", card->dev.name[0]?card->dev.name:"Unknown");
+			printk(KERN_INFO "isapnp: Card '%s'\n", card->name[0]?card->name:"Unknown");
 			if (isapnp_verbose < 2)
 				continue;
 			card_for_each_dev(card,dev) {
-				printk(KERN_INFO "isapnp:   Device '%s'\n", dev->dev.name[0]?dev->dev.name:"Unknown");
+				printk(KERN_INFO "isapnp:   Device '%s'\n", dev->name[0]?dev->name:"Unknown");
 			}
 		}
 	}

drivers/serial/8250_pnp.c +1 -1

@@ -369,7 +369,7 @@
  */
 static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags)
 {
-	if (!(check_name(dev->dev.name) || (dev->card && check_name(dev->card->dev.name))))
+	if (!(check_name(pnp_dev_name(dev)) || (dev->card && check_name(dev->card->name))))
 		return -ENODEV;
 
 	if (check_resources(dev->independent))

include/linux/pnp.h +3 -0

@@ -19,6 +19,7 @@
 #define PNP_MAX_DMA		2
 #define PNP_MAX_DEVICES		8
 #define PNP_ID_LEN		8
+#define PNP_NAME_LEN		50
 
 struct pnp_protocol;
 struct pnp_dev;

@@ -133,6 +134,7 @@
 	struct pnp_protocol * protocol;
 	struct pnp_id * id;		/* contains supported EISA IDs*/
 
+	char name[PNP_NAME_LEN];	/* contains a human-readable name */
 	unsigned char	pnpver;		/* Plug & Play version */
 	unsigned char	productver;	/* product version */
 	unsigned int	serial;		/* serial number */

@@ -187,6 +189,7 @@
 	struct pnp_option * dependent;
 	struct pnp_resource_table res;
 
+	char name[PNP_NAME_LEN];	/* contains a human-readable name */
 	unsigned short	regs;		/* ISAPnP: supported registers */
 	int 		flags;		/* used by protocols */
 	struct proc_dir_entry *procent;	/* device entry in /proc/bus/isapnp */

Hopefully, this is not a duplicate post:
===========================================

drivers/ieee1394/nodemgr.c: In function `nodemgr_update_ud_names':
drivers/ieee1394/nodemgr.c:471: error: structure has no member named name' drivers/ieee1394/nodemgr.c: In function nodemgr_create_node':
drivers/ieee1394/nodemgr.c:723: error: structure has no member named name' drivers/ieee1394/nodemgr.c: In function nodemgr_update_node':
drivers/ieee1394/nodemgr.c:1318: error: structure has no member named name' drivers/ieee1394/nodemgr.c: In function nodemgr_add_host':
drivers/ieee1394/nodemgr.c:1775: error: structure has no member named `name' make[2]: *** [drivers/ieee1394/nodemgr.o] Error 1
make[1]: *** [drivers/ieee1394] Error 2
make: *** [drivers] Error 2

I removed struct device.name and forgot to change the firewire code :(

I'll work on a patch for this later this evening, unless someone beats me to it.

Quoted 4 lines · Greg KH

I removed struct device.name and forgot to change the firewire code :(

I'll work on a patch for this later this evening, unless someone beats me to it.

Why wasn't DEVICE_NAME_SIZE/_HALF killed? Looks like these also should define by drivers.

Quoted 14 lines · Ivan Gyurdiev

Hopefully, this is not a duplicate post:
===========================================

drivers/ieee1394/nodemgr.c: In function `nodemgr_update_ud_names':
drivers/ieee1394/nodemgr.c:471: error: structure has no member named name' drivers/ieee1394/nodemgr.c: In function nodemgr_create_node':
drivers/ieee1394/nodemgr.c:723: error: structure has no member named name' drivers/ieee1394/nodemgr.c: In function nodemgr_update_node':
drivers/ieee1394/nodemgr.c:1318: error: structure has no member named name' drivers/ieee1394/nodemgr.c: In function nodemgr_add_host':
drivers/ieee1394/nodemgr.c:1775: error: structure has no member named `name' make[2]: *** [drivers/ieee1394/nodemgr.o] Error 1
make[1]: *** [drivers/ieee1394] Error 2
make: *** [drivers] Error 2

I removed struct device.name and forgot to change the firewire code :(

I'll work on a patch for this later this evening, unless someone beats me to it.