Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6866ac9d authored by Sachin Sant's avatar Sachin Sant Committed by Greg Kroah-Hartman
Browse files

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: default avatarSachin Sant <sachinp@in.ibm.com>
Acked-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 54ca5412

drivers/usb/host/fhci-dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/fhci-hcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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;