From e913397202b7551299da20fc8cf7b90c46f61ba3 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 30 Oct 2008 01:59:32 +0100 Subject: [PATCH] staging: struct device - replace bus_id with dev_name(), dev_set_name() Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- drivers/staging/at76_usb/at76_usb.c | 2 +- drivers/staging/poch/poch.c | 2 +- drivers/staging/usbip/stub.h | 2 +- drivers/staging/usbip/stub_dev.c | 2 +- drivers/staging/usbip/stub_main.c | 21 +++++++++++---------- drivers/staging/usbip/stub_rx.c | 4 ++-- drivers/staging/usbip/vhci_hcd.c | 2 +- drivers/staging/usbip/vhci_sysfs.c | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c index c68d2279d495..185533e54769 100644 --- a/drivers/staging/at76_usb/at76_usb.c +++ b/drivers/staging/at76_usb/at76_usb.c @@ -2534,7 +2534,7 @@ static int at76_init_new_device(struct at76_priv *priv, dev_info(dev, "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n", wiphy_name(priv->hw->wiphy), - interface->dev.bus_id, mac2str(priv->mac_addr), + dev_name(&interface->dev), mac2str(priv->mac_addr), priv->fw_version.major, priv->fw_version.minor, priv->fw_version.patch, priv->fw_version.build); dev_info(dev, "%s: regulatory domain 0x%02x: %s\n", diff --git a/drivers/staging/poch/poch.c b/drivers/staging/poch/poch.c index 1f14792b917e..ec343ef53a85 100644 --- a/drivers/staging/poch/poch.c +++ b/drivers/staging/poch/poch.c @@ -1321,7 +1321,7 @@ static int __devinit poch_pci_probe(struct pci_dev *pdev, } ret = request_irq(pdev->irq, poch_irq_handler, IRQF_SHARED, - dev->bus_id, poch_dev); + dev_name(dev), poch_dev); if (ret) { dev_err(dev, "error requesting IRQ %u\n", pdev->irq); ret = -ENOMEM; diff --git a/drivers/staging/usbip/stub.h b/drivers/staging/usbip/stub.h index f541a3a83bd3..022d0649ac5e 100644 --- a/drivers/staging/usbip/stub.h +++ b/drivers/staging/usbip/stub.h @@ -91,5 +91,5 @@ void stub_rx_loop(struct usbip_task *); void stub_enqueue_ret_unlink(struct stub_device *, __u32, __u32); /* stub_main.c */ -int match_busid(char *busid); +int match_busid(const char *busid); void stub_device_cleanup_urbs(struct stub_device *sdev); diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c index ee455a087eaf..1e320caf3d11 100644 --- a/drivers/staging/usbip/stub_dev.c +++ b/drivers/staging/usbip/stub_dev.c @@ -389,7 +389,7 @@ static int stub_probe(struct usb_interface *interface, { struct usb_device *udev = interface_to_usbdev(interface); struct stub_device *sdev = NULL; - char *udev_busid = interface->dev.parent->bus_id; + const char *udev_busid = dev_name(interface->dev.parent); int err = 0; dev_dbg(&interface->dev, "Enter\n"); diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index c665d7f1ca9a..05e4c6064390 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -40,11 +40,12 @@ struct kmem_cache *stub_priv_cache; * remote host. */ #define MAX_BUSID 16 -static char busid_table[MAX_BUSID][BUS_ID_SIZE]; +#define BUSID_SIZE 20 +static char busid_table[MAX_BUSID][BUSID_SIZE]; static spinlock_t busid_table_lock; -int match_busid(char *busid) +int match_busid(const char *busid) { int i; @@ -52,7 +53,7 @@ int match_busid(char *busid) for (i = 0; i < MAX_BUSID; i++) if (busid_table[i][0]) - if (!strncmp(busid_table[i], busid, BUS_ID_SIZE)) { + if (!strncmp(busid_table[i], busid, BUSID_SIZE)) { /* already registerd */ spin_unlock(&busid_table_lock); return 0; @@ -92,7 +93,7 @@ static int add_match_busid(char *busid) for (i = 0; i < MAX_BUSID; i++) if (!busid_table[i][0]) { - strncpy(busid_table[i], busid, BUS_ID_SIZE); + strncpy(busid_table[i], busid, BUSID_SIZE); spin_unlock(&busid_table_lock); return 0; } @@ -109,9 +110,9 @@ static int del_match_busid(char *busid) spin_lock(&busid_table_lock); for (i = 0; i < MAX_BUSID; i++) - if (!strncmp(busid_table[i], busid, BUS_ID_SIZE)) { + if (!strncmp(busid_table[i], busid, BUSID_SIZE)) { /* found */ - memset(busid_table[i], 0, BUS_ID_SIZE); + memset(busid_table[i], 0, BUSID_SIZE); spin_unlock(&busid_table_lock); return 0; } @@ -125,19 +126,19 @@ static ssize_t store_match_busid(struct device_driver *dev, const char *buf, size_t count) { int len; - char busid[BUS_ID_SIZE]; + char busid[BUSID_SIZE]; if (count < 5) return -EINVAL; /* strnlen() does not include \0 */ - len = strnlen(buf + 4, BUS_ID_SIZE); + len = strnlen(buf + 4, BUSID_SIZE); /* busid needs to include \0 termination */ - if (!(len < BUS_ID_SIZE)) + if (!(len < BUSID_SIZE)) return -EINVAL; - strncpy(busid, buf + 4, BUS_ID_SIZE); + strncpy(busid, buf + 4, BUSID_SIZE); if (!strncmp(buf, "add ", 4)) { diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index 36ce898fced5..2a2cc0f051cc 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c @@ -157,7 +157,7 @@ static int tweak_set_configuration_cmd(struct urb *urb) * A user may need to set a special configuration value before * exporting the device. */ - uinfo("set_configuration (%d) to %s\n", config, urb->dev->dev.bus_id); + uinfo("set_configuration (%d) to %s\n", config, dev_name(&urb->dev->dev)); uinfo("but, skip!\n"); return 0; @@ -175,7 +175,7 @@ static int tweak_reset_device_cmd(struct urb *urb) value = le16_to_cpu(req->wValue); index = le16_to_cpu(req->wIndex); - uinfo("reset_device (port %d) to %s\n", index, urb->dev->dev.bus_id); + uinfo("reset_device (port %d) to %s\n", index, dev_name(&urb->dev->dev)); /* all interfaces should be owned by usbip driver, so just reset it. */ ret = usb_lock_device_for_reset(urb->dev, NULL); diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index 5b5a2e348ecb..f69ca346aa2f 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c @@ -1091,7 +1091,7 @@ static int vhci_hcd_probe(struct platform_device *pdev) * Allocate and initialize hcd. * Our private data is also allocated automatically. */ - hcd = usb_create_hcd(&vhci_hc_driver, &pdev->dev, pdev->dev.bus_id); + hcd = usb_create_hcd(&vhci_hc_driver, &pdev->dev, dev_name(&pdev->dev)); if (!hcd) { uerr("create hcd failed\n"); return -ENOMEM; diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c index 24c2851a8f84..0fd33a62d934 100644 --- a/drivers/staging/usbip/vhci_sysfs.c +++ b/drivers/staging/usbip/vhci_sysfs.c @@ -60,7 +60,7 @@ static ssize_t show_status(struct device *dev, struct device_attribute *attr, out += sprintf(out, "%03u %08x ", vdev->speed, vdev->devid); out += sprintf(out, "%16p ", vdev->ud.tcp_socket); - out += sprintf(out, "%s", vdev->udev->dev.bus_id); + out += sprintf(out, "%s", dev_name(&vdev->udev->dev)); } else out += sprintf(out, "000 000 000 0000000000000000 0-0");