Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ssb: struct device - replace bus_id with dev_name(), dev_set_name()

This patch is part of a larger patch series which will remove
the "char bus_id[20]" name string from struct device. The device
name is managed in the kobject anyway, and without any size
limitation, and just needlessly copied into "struct device".

To set and read the device name dev_name(dev) and dev_set_name(dev)
must be used. If your code uses static kobjects, which it shouldn't
do, "const char *init_name" can be used to statically provide the
name the registered device should have. At registration time, the
init_name field is cleared, to enforce the use of dev_name(dev) to
access the device name at a later time.

We need to get rid of all occurrences of bus_id in the entire tree
to be able to enable the new interface. Please apply this patch,
and possibly convert any remaining remaining occurrences of bus_id.

We want to submit a patch to -next, which will remove bus_id from
"struct device", to find the remaining pieces to convert, and finally
switch over to the new api, which will remove the 20 bytes array
and does no longer have a size limitation.

CC: Michael Buesch <mb@bu3sch.de>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Kay Sievers and committed by
John W. Linville
b7b05fe7 582c1b53

+6 -7
+5 -6
drivers/ssb/main.c
··· 226 226 err = drv->suspend(dev, state); 227 227 if (err) { 228 228 ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n", 229 - dev->dev->bus_id); 229 + dev_name(dev->dev)); 230 230 goto err_unwind; 231 231 } 232 232 } ··· 269 269 err = drv->resume(dev); 270 270 if (err) { 271 271 ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n", 272 - dev->dev->bus_id); 272 + dev_name(dev->dev)); 273 273 } 274 274 } 275 275 ··· 454 454 455 455 dev->release = ssb_release_dev; 456 456 dev->bus = &ssb_bustype; 457 - snprintf(dev->bus_id, sizeof(dev->bus_id), 458 - "ssb%u:%d", bus->busnumber, dev_idx); 457 + dev_set_name(dev, "ssb%u:%d", bus->busnumber, dev_idx); 459 458 460 459 switch (bus->bustype) { 461 460 case SSB_BUSTYPE_PCI: ··· 479 480 if (err) { 480 481 ssb_printk(KERN_ERR PFX 481 482 "Could not register %s\n", 482 - dev->bus_id); 483 + dev_name(dev)); 483 484 /* Set dev to NULL to not unregister 484 485 * dev on error unwinding. */ 485 486 sdev->dev = NULL; ··· 795 796 err = ssb_bus_register(bus, ssb_pci_get_invariants, 0); 796 797 if (!err) { 797 798 ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on " 798 - "PCI device %s\n", host_pci->dev.bus_id); 799 + "PCI device %s\n", dev_name(&host_pci->dev)); 799 800 } 800 801 801 802 return err;
+1 -1
drivers/ssb/pcihost_wrapper.c
··· 65 65 err = pci_enable_device(dev); 66 66 if (err) 67 67 goto err_kfree_ssb; 68 - name = dev->dev.bus_id; 68 + name = dev_name(&dev->dev); 69 69 if (dev->driver && dev->driver->name) 70 70 name = dev->driver->name; 71 71 err = pci_request_regions(dev, name);