提交 6866ac9d 编写于 作者: S Sachin Sant 提交者: Greg Kroah-Hartman

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: NSachin Sant <sachinp@in.ibm.com>
Acked-by: NAnton Vorontsov <avorontsov@ru.mvista.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 54ca5412
...@@ -108,7 +108,7 @@ void fhci_dfs_create(struct fhci_hcd *fhci) ...@@ -108,7 +108,7 @@ void fhci_dfs_create(struct fhci_hcd *fhci)
{ {
struct device *dev = fhci_to_hcd(fhci)->self.controller; 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) { if (!fhci->dfs_root) {
WARN_ON(1); WARN_ON(1);
return; return;
......
...@@ -583,7 +583,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev, ...@@ -583,7 +583,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev,
if (sprop && strcmp(sprop, "host")) if (sprop && strcmp(sprop, "host"))
return -ENODEV; return -ENODEV;
hcd = usb_create_hcd(&fhci_driver, dev, dev->bus_id); hcd = usb_create_hcd(&fhci_driver, dev, dev_name(dev));
if (!hcd) { if (!hcd) {
dev_err(dev, "could not create hcd\n"); dev_err(dev, "could not create hcd\n");
return -ENOMEM; return -ENOMEM;
...@@ -650,7 +650,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev, ...@@ -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) { if (ret) {
dev_err(dev, "failed to request gpio %d", i); dev_err(dev, "failed to request gpio %d", i);
goto err_gpios; goto err_gpios;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册