From 6fe2893567b525d207bc5f69d7b34652f0f70b87 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 17 Aug 2003 20:42:10 -0700 Subject: [PATCH] Fix more drivers that broke due to losing the 'name' entry. --- drivers/char/mwave/mwavedd.c | 1 - drivers/input/gameport/emu10k1-gp.c | 6 +++--- drivers/input/gameport/fm801-gp.c | 4 ++-- drivers/input/gameport/ns558.c | 2 +- drivers/input/gameport/vortex.c | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c index e0c98936c2333..ef3dd96fdbff0 100644 --- a/drivers/char/mwave/mwavedd.c +++ b/drivers/char/mwave/mwavedd.c @@ -643,7 +643,6 @@ static int __init mwave_init(void) /* sysfs */ memset(&mwave_device, 0, sizeof (struct device)); - snprintf(mwave_device.name, DEVICE_NAME_SIZE, "mwave"); snprintf(mwave_device.bus_id, BUS_ID_SIZE, "mwave"); if (device_register(&mwave_device)) diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c index ccb221937cbd5..ec18fb32b7a53 100644 --- a/drivers/input/gameport/emu10k1-gp.c +++ b/drivers/input/gameport/emu10k1-gp.c @@ -84,7 +84,7 @@ static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id emu->dev = pdev; emu->gameport.io = ioport; - emu->gameport.name = pdev->dev.name; + emu->gameport.name = pci_name(pdev); emu->gameport.phys = emu->phys; emu->gameport.id.bustype = BUS_PCI; emu->gameport.id.vendor = pdev->vendor; @@ -94,8 +94,8 @@ static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id gameport_register_port(&emu->gameport); - printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n", - pdev->dev.name, pci_name(pdev), emu->gameport.speed); + printk(KERN_INFO "gameport: pci%s speed %d kHz\n", + pci_name(pdev), emu->gameport.speed); return 0; } diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c index ffa240f552b8e..95ca91f911776 100644 --- a/drivers/input/gameport/fm801-gp.c +++ b/drivers/input/gameport/fm801-gp.c @@ -115,8 +115,8 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device gameport_register_port(&gp->gameport); - printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n", - pci->dev.name, pci_name(pci), gp->gameport.speed); + printk(KERN_INFO "gameport: at pci%s speed %d kHz\n", + pci_name(pci), gp->gameport.speed); return 0; } diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c index e9acad1b3b009..c3de56ebe1940 100644 --- a/drivers/input/gameport/ns558.c +++ b/drivers/input/gameport/ns558.c @@ -222,7 +222,7 @@ static int ns558_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *did) port->gameport.id.version = 0x100; sprintf(port->phys, "pnp%s/gameport0", dev->dev.bus_id); - sprintf(port->name, "%s", dev->dev.name[0] ? dev->dev.name : "NS558 PnP Gameport"); + sprintf(port->name, "%s", "NS558 PnP Gameport"); gameport_register_port(&port->gameport); diff --git a/drivers/input/gameport/vortex.c b/drivers/input/gameport/vortex.c index 7bdefd94ad095..32ea09ec5ac33 100644 --- a/drivers/input/gameport/vortex.c +++ b/drivers/input/gameport/vortex.c @@ -127,7 +127,7 @@ static int __devinit vortex_probe(struct pci_dev *dev, const struct pci_device_i vortex->gameport.cooked_read = vortex_cooked_read; vortex->gameport.open = vortex_open; - vortex->gameport.name = dev->dev.name; + vortex->gameport.name = pci_name(dev); vortex->gameport.phys = vortex->phys; vortex->gameport.id.bustype = BUS_PCI; vortex->gameport.id.vendor = dev->vendor; @@ -145,8 +145,8 @@ static int __devinit vortex_probe(struct pci_dev *dev, const struct pci_device_i gameport_register_port(&vortex->gameport); - printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n", - dev->dev.name, pci_name(dev), vortex->gameport.speed); + printk(KERN_INFO "gameport at pci%s speed %d kHz\n", + pci_name(dev), vortex->gameport.speed); return 0; } -- 2.53.0