fix compile breakage in drivers/input/gameport

Hi Matthew,

could you check whether the patch below that does a name -> dev.name to fix the following compile errors is correct?

<-- snip -->

...
gcc -Wp,-MD,drivers/input/gameport/.fm801-gp.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include -DKBUILD_BASENAME=fm801_gp -DKBUILD_MODNAME=fm801_gp -c -o drivers/input/gameport/fm801-gp.o drivers/input/gameport/fm801-gp.c
drivers/input/gameport/fm801-gp.c: In function `fm801_gp_probe':
drivers/input/gameport/fm801-gp.c:119: structure has no member named `name' make[2]: *** [drivers/input/gameport/fm801-gp.o] Error 1
...
gcc -Wp,-MD,drivers/input/gameport/.ns558.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include -DKBUILD_BASENAME=ns558 -DKBUILD_MODNAME=ns558
-c -o drivers/input/gameport/ns558.o drivers/input/gameport/ns558.c
drivers/input/gameport/ns558.c: In function `ns558_pnp_probe':
drivers/input/gameport/ns558.c:239: structure has no member named name' drivers/input/gameport/ns558.c:239: structure has no member named name' make[2]: *** [drivers/input/gameport/ns558.o] Error 1
...
gcc -Wp,-MD,drivers/input/gameport/.vortex.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include -DKBUILD_BASENAME=vortex -DKBUILD_MODNAME=vor
tex -c -o drivers/input/gameport/vortex.o drivers/input/gameport/vortex.c
drivers/input/gameport/vortex.c: In function `vortex_probe':
drivers/input/gameport/vortex.c:130: structure has no member named name' drivers/input/gameport/vortex.c:149: structure has no member named name' make[2]: *** [drivers/input/gameport/vortex.o] Error 1

<-- snip -->

TIA
Adrian

drivers/input/gameport/fm801-gp.c renamed from drivers/input/gameport/fm801-gp.c.old +1 -1

@@ -116,7 +116,7 @@
 	gameport_register_port(&gp->gameport);
 
 	printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
-		pci->name, pci->slot_name, gp->gameport.speed);
+		pci->dev.name, pci->slot_name, gp->gameport.speed);
 
 	return 0;
 }

drivers/input/gameport/ns558.c renamed from drivers/input/gameport/ns558.c.old +1 -1

@@ -236,7 +236,7 @@
 	port->gameport.id.version = 0x100;
 
 	sprintf(port->phys, "isapnp%d.%d/gameport0", PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
-	sprintf(port->name, "%s", dev->name[0] ? dev->name : "NS558 PnP Gameport");
+	sprintf(port->name, "%s", dev->dev.name[0] ? dev->dev.name : "NS558 PnP Gameport");
 
 	gameport_register_port(&port->gameport);
 

drivers/input/gameport/vortex.c renamed from drivers/input/gameport/vortex.c.old +2 -2

@@ -127,7 +127,7 @@
 	vortex->gameport.cooked_read = vortex_cooked_read;
 	vortex->gameport.open = vortex_open;
 
-	vortex->gameport.name = dev->name;
+	vortex->gameport.name = dev->dev.name;
 	vortex->gameport.phys = vortex->phys;
 	vortex->gameport.id.bustype = BUS_PCI;
 	vortex->gameport.id.vendor = dev->vendor;

@@ -146,7 +146,7 @@
 	gameport_register_port(&vortex->gameport);
 
 	printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
-		dev->name, dev->slot_name, vortex->gameport.speed);
+		dev->dev.name, dev->slot_name, vortex->gameport.speed);
 
 	return 0;
 }

Quoted 4 lines · Adrian Bunk

Hi Matthew,

could you check whether the patch below that does a name -> dev.name to fix the following compile errors is correct?

Looks Ok to me. Should I merge it in?