USB: FHCI: use dev_name() in place of bus_id.

Replace references to bus_id with dev_name() to fix fhci driver build break.

drivers/usb/host/fhci-hcd.c:586: error: struct device has no member named bus_id
drivers/usb/host/fhci-hcd.c:653: error: struct device has no member named bus_id
drivers/usb/host/fhci-dbg.c:111: error: struct device has no member named bus_id

Signed-off-by: Sachin Sant <sachinp@in.ibm.com>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/fhci-dbg.c b/drivers/usb/host/fhci-dbg.c
index 34e14edf390bd2d49df420ab80a3b1297aead67b..ea8a4255c5da25b29136da57b8849c7bdd3f4285 100644 (file)
--- a/drivers/usb/host/fhci-dbg.c
+++ b/drivers/usb/host/fhci-dbg.c
@@ -108,7 +108,7 @@ void fhci_dfs_create(struct fhci_hcd *fhci)
 {
        struct device *dev = fhci_to_hcd(fhci)->self.controller;
 
-       fhci->dfs_root = debugfs_create_dir(dev->bus_id, NULL);
+       fhci->dfs_root = debugfs_create_dir(dev_name(dev), NULL);
        if (!fhci->dfs_root) {
                WARN_ON(1);
                return;

diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index ba622cc8a9bafa4db356a029c9898a067e6bb95d..0951818ef93b8838651597b3acef7795a193eca3 100644 (file)
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -583,7 +583,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev,
        if (sprop && strcmp(sprop, "host"))
                return -ENODEV;
 
-       hcd = usb_create_hcd(&fhci_driver, dev, dev->bus_id);
+       hcd = usb_create_hcd(&fhci_driver, dev, dev_name(dev));
        if (!hcd) {
                dev_err(dev, "could not create hcd\n");
                return -ENOMEM;
@@ -650,7 +650,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev,
                        }
                }
 
-               ret = gpio_request(gpio, dev->bus_id);
+               ret = gpio_request(gpio, dev_name(dev));
                if (ret) {
                        dev_err(dev, "failed to request gpio %d", i);
                        goto err_gpios;