split up the big patch into a usb specific one or two, or three...

author: Greg Kroah-Hartman <gregkh@suse.de> 2008-06-11 11:38:03 -0700
committer: Greg Kroah-Hartman <gregkh@suse.de> 2008-06-11 11:38:03 -0700
commit: 4639b8f792579cbf5b835097c4fdb14b68542c49 (patch)
tree: fef3e5a2f04ca32671a7133abfc56b05897bd2b6 /usb
parent: 33c9cb3493fbb0f8f04e729a28aa9ec799d662aa (diff)
download: patches-4639b8f792579cbf5b835097c4fdb14b68542c49.tar.gz
3 files changed, 767 insertions, 0 deletions
diff --git a/usb/usb-make-bus_id-const-in-struct-usb_bus.patch b/usb/usb-make-bus_id-const-in-struct-usb_bus.patch
new file mode 100644
index 00000000000000..a6cf95f2a92ba5
--- /dev/null
+++ b/usb/usb-make-bus_id-const-in-struct-usb_bus.patch
@@ -0,0 +1,50 @@
+From kay.sievers@vrfy.org Fri May  2 09:28:43 2008
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Fri, 02 May 2008 06:02:41 +0200
+Subject: USB: make bus_id const in struct usb_bus
+Message-ID: <1209700961.3100.6.camel@linux.site>
+
+This field is const, so mark it as such.
+
+Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/hcd.c |    2 +-
+ drivers/usb/core/hcd.h |    2 +-
+ include/linux/usb.h    |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -1744,7 +1744,7 @@ EXPORT_SYMBOL_GPL (usb_hc_died);
+  * If memory is unavailable, returns NULL.
+  */
+ struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,
+-		struct device *dev, char *bus_name)
++		struct device *dev, const char *bus_name)
+ {
+ 	struct usb_hcd *hcd;
+ 
+--- a/drivers/usb/core/hcd.h
++++ b/drivers/usb/core/hcd.h
+@@ -233,7 +233,7 @@ extern void usb_hcd_disable_endpoint(str
+ extern int usb_hcd_get_frame_number(struct usb_device *udev);
+ 
+ extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
+-		struct device *dev, char *bus_name);
++		struct device *dev, const char *bus_name);
+ extern struct usb_hcd *usb_get_hcd(struct usb_hcd *hcd);
+ extern void usb_put_hcd(struct usb_hcd *hcd);
+ extern int usb_add_hcd(struct usb_hcd *hcd,
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
+@@ -293,7 +293,7 @@ struct usb_devmap {
+ struct usb_bus {
+ 	struct device *controller;	/* host/master side hardware */
+ 	int busnum;			/* Bus number (in order of reg) */
+-	char *bus_name;			/* stable id (PCI slot_name etc) */
++	const char *bus_name;		/* stable id (PCI slot_name etc) */
+ 	u8 uses_dma;			/* Does the host controller use DMA? */
+ 	u8 otg_port;			/* 0, or number of OTG/HNP port */
+ 	unsigned is_b_host:1;		/* true during some HNP roleswitches */
diff --git a/usb/usb-usb-dev_name-instead-of-dev-bus_id.patch b/usb/usb-usb-dev_name-instead-of-dev-bus_id.patch
new file mode 100644
index 00000000000000..84c2175fc3509b
--- /dev/null
+++ b/usb/usb-usb-dev_name-instead-of-dev-bus_id.patch
@@ -0,0 +1,534 @@
+From kay.sievers@vrfy.org Fri May  2 09:28:43 2008
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Fri, 02 May 2008 06:02:41 +0200
+Subject: USB: usb dev_name() instead of dev->bus_id
+Message-ID: <1209700961.3100.6.camel@linux.site>
+
+The bus_id field is going away, use the dev_name() function instead.
+
+Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/driver.c         |    6 +++---
+ drivers/usb/core/endpoint.c       |    2 +-
+ drivers/usb/core/file.c           |   10 +++++-----
+ drivers/usb/core/hcd.c            |    4 ++--
+ drivers/usb/core/message.c        |    6 +++---
+ drivers/usb/core/usb.c            |    2 +-
+ drivers/usb/gadget/dummy_hcd.c    |    2 +-
+ drivers/usb/gadget/ether.c        |    2 +-
+ drivers/usb/gadget/file_storage.c |    2 +-
+ drivers/usb/gadget/lh7a40x_udc.c  |    2 +-
+ drivers/usb/gadget/pxa2xx_udc.c   |    2 +-
+ drivers/usb/host/ehci-dbg.c       |    4 ++--
+ drivers/usb/host/ehci-fsl.c       |   12 ++++++------
+ drivers/usb/host/ehci-ixp4xx.c    |    8 ++++----
+ drivers/usb/host/ehci-orion.c     |    8 ++++----
+ drivers/usb/host/ehci-ps3.c       |    2 +-
+ drivers/usb/host/isp116x-hcd.c    |    2 +-
+ drivers/usb/host/isp1760-if.c     |    6 +++---
+ drivers/usb/host/ohci-dbg.c       |    2 +-
+ drivers/usb/host/ohci-omap.c      |    2 +-
+ drivers/usb/host/ohci-pnx4008.c   |    2 +-
+ drivers/usb/host/ohci-ps3.c       |    2 +-
+ drivers/usb/host/ohci-sm501.c     |    2 +-
+ drivers/usb/host/ohci-ssb.c       |    2 +-
+ drivers/usb/host/sl811-hcd.c      |    2 +-
+ drivers/usb/host/u132-hcd.c       |    2 +-
+ drivers/usb/serial/usb-serial.c   |    4 ++--
+ 27 files changed, 51 insertions(+), 51 deletions(-)
+
+--- a/drivers/usb/core/driver.c
++++ b/drivers/usb/core/driver.c
+@@ -586,7 +586,7 @@ static int usb_uevent(struct device *dev
+ 	struct usb_device *usb_dev;
+ 
+ 	/* driver is often null here; dev_dbg() would oops */
+-	pr_debug("usb %s: uevent\n", dev->bus_id);
++	pr_debug("usb %s: uevent\n", dev_name(dev));
+ 
+ 	if (is_usb_device(dev))
+ 		usb_dev = to_usb_device(dev);
+@@ -596,11 +596,11 @@ static int usb_uevent(struct device *dev
+ 	}
+ 
+ 	if (usb_dev->devnum < 0) {
+-		pr_debug("usb %s: already deleted?\n", dev->bus_id);
++		pr_debug("usb %s: already deleted?\n", dev_name(dev));
+ 		return -ENODEV;
+ 	}
+ 	if (!usb_dev->bus) {
+-		pr_debug("usb %s: bus removed?\n", dev->bus_id);
++		pr_debug("usb %s: bus removed?\n", dev_name(dev));
+ 		return -ENODEV;
+ 	}
+ 
+--- a/drivers/usb/core/endpoint.c
++++ b/drivers/usb/core/endpoint.c
+@@ -296,7 +296,7 @@ int usb_create_ep_files(struct device *p
+ 	retval = endpoint_get_minor(ep_dev);
+ 	if (retval) {
+ 		dev_err(parent, "can not allocate minor number for %s\n",
+-			ep_dev->dev.bus_id);
++			dev_name(&ep_dev->dev));
+ 		goto error_register;
+ 	}
+ 
+--- a/drivers/usb/core/file.c
++++ b/drivers/usb/core/file.c
+@@ -147,7 +147,7 @@ int usb_register_dev(struct usb_interfac
+ 	int retval = -EINVAL;
+ 	int minor_base = class_driver->minor_base;
+ 	int minor = 0;
+-	char name[BUS_ID_SIZE];
++	char name[20];
+ 	char *temp;
+ 
+ #ifdef CONFIG_USB_DYNAMIC_MINORS
+@@ -187,9 +187,9 @@ int usb_register_dev(struct usb_interfac
+ 	intf->minor = minor;
+ 
+ 	/* create a usb class device for this usb interface */
+-	snprintf(name, BUS_ID_SIZE, class_driver->name, minor - minor_base);
++	snprintf(name, sizeof(name), class_driver->name, minor - minor_base);
+ 	temp = strrchr(name, '/');
+-	if (temp && (temp[1] != 0x00))
++	if (temp && (temp[1] != '\0'))
+ 		++temp;
+ 	else
+ 		temp = name;
+@@ -225,7 +225,7 @@ void usb_deregister_dev(struct usb_inter
+ 			struct usb_class_driver *class_driver)
+ {
+ 	int minor_base = class_driver->minor_base;
+-	char name[BUS_ID_SIZE];
++	char name[20];
+ 
+ #ifdef CONFIG_USB_DYNAMIC_MINORS
+ 	minor_base = 0;
+@@ -240,7 +240,7 @@ void usb_deregister_dev(struct usb_inter
+ 	usb_minors[intf->minor] = NULL;
+ 	up_write(&minor_rwsem);
+ 
+-	snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base);
++	snprintf(name, sizeof(name), class_driver->name, intf->minor - minor_base);
+ 	device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));
+ 	intf->usb_dev = NULL;
+ 	intf->minor = -1;
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -900,14 +900,14 @@ static int register_root_hub(struct usb_
+ 	if (retval != sizeof usb_dev->descriptor) {
+ 		mutex_unlock(&usb_bus_list_lock);
+ 		dev_dbg (parent_dev, "can't read %s device descriptor %d\n",
+-				usb_dev->dev.bus_id, retval);
++				dev_name(&usb_dev->dev), retval);
+ 		return (retval < 0) ? retval : -EMSGSIZE;
+ 	}
+ 
+ 	retval = usb_new_device (usb_dev);
+ 	if (retval) {
+ 		dev_err (parent_dev, "can't register root hub for %s, %d\n",
+-				usb_dev->dev.bus_id, retval);
++				dev_name(&usb_dev->dev), retval);
+ 	}
+ 	mutex_unlock(&usb_bus_list_lock);
+ 
+--- a/drivers/usb/core/message.c
++++ b/drivers/usb/core/message.c
+@@ -1090,7 +1090,7 @@ void usb_disable_device(struct usb_devic
+ 			if (!device_is_registered(&interface->dev))
+ 				continue;
+ 			dev_dbg(&dev->dev, "unregistering interface %s\n",
+-				interface->dev.bus_id);
++				dev_name(&interface->dev));
+ 			device_del(&interface->dev);
+ 			usb_remove_sysfs_intf_files(interface);
+ 		}
+@@ -1631,12 +1631,12 @@ free_interfaces:
+ 
+ 		dev_dbg(&dev->dev,
+ 			"adding %s (config #%d, interface %d)\n",
+-			intf->dev.bus_id, configuration,
++			dev_name(&intf->dev), configuration,
+ 			intf->cur_altsetting->desc.bInterfaceNumber);
+ 		ret = device_add(&intf->dev);
+ 		if (ret != 0) {
+ 			dev_err(&dev->dev, "device_add(%s) --> %d\n",
+-				intf->dev.bus_id, ret);
++				dev_name(&intf->dev), ret);
+ 			continue;
+ 		}
+ 		usb_create_sysfs_intf_files(intf);
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -308,7 +308,7 @@ struct usb_device *usb_alloc_dev(struct 
+ 	 * by location for diagnostics, tools, driver model, etc.  The
+ 	 * string is a path along hub ports, from the root.  Each device's
+ 	 * dev->devpath will be stable until USB is re-cabled, and hubs
+-	 * are often labeled with these port numbers.  The bus_id isn't
++	 * are often labeled with these port numbers.  The name isn't
+ 	 * as stable:  bus->busnum changes easily from modprobe order,
+ 	 * cardbus or pci hotplugging, and so on.
+ 	 */
+--- a/drivers/usb/gadget/dummy_hcd.c
++++ b/drivers/usb/gadget/dummy_hcd.c
+@@ -1865,7 +1865,7 @@ static int dummy_hcd_probe(struct platfo
+ 
+ 	dev_info(&pdev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
+ 
+-	hcd = usb_create_hcd(&dummy_hcd, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd(&dummy_hcd, &pdev->dev, dev_name(&pdev));
+ 	if (!hcd)
+ 		return -ENOMEM;
+ 	the_controller = hcd_to_dummy (hcd);
+--- a/drivers/usb/gadget/ether.c
++++ b/drivers/usb/gadget/ether.c
+@@ -1642,7 +1642,7 @@ static void eth_get_drvinfo(struct net_d
+ 	strlcpy(p->driver, shortname, sizeof p->driver);
+ 	strlcpy(p->version, DRIVER_VERSION, sizeof p->version);
+ 	strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version);
+-	strlcpy (p->bus_info, dev->gadget->dev.bus_id, sizeof p->bus_info);
++	strlcpy (p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info);
+ }
+ 
+ static u32 eth_get_link(struct net_device *net)
+--- a/drivers/usb/gadget/file_storage.c
++++ b/drivers/usb/gadget/file_storage.c
+@@ -3868,7 +3868,7 @@ static int __init fsg_bind(struct usb_ga
+ 		curlun->dev.driver = &fsg_driver.driver;
+ 		dev_set_drvdata(&curlun->dev, fsg);
+ 		snprintf(curlun->dev.bus_id, BUS_ID_SIZE,
+-				"%s-lun%d", gadget->dev.bus_id, i);
++				"%s-lun%d", dev_name(&gadget->dev), i);
+ 
+ 		if ((rc = device_register(&curlun->dev)) != 0) {
+ 			INFO(fsg, "failed to register LUN%d: %d\n", i, rc);
+--- a/drivers/usb/gadget/lh7a40x_udc.c
++++ b/drivers/usb/gadget/lh7a40x_udc.c
+@@ -1970,7 +1970,7 @@ static const struct usb_gadget_ops lh7a4
+ 
+ static void nop_release(struct device *dev)
+ {
+-	DEBUG("%s %s\n", __func__, dev->bus_id);
++	DEBUG("%s %s\n", __func__, dev_name(dev));
+ }
+ 
+ static struct lh7a40x_udc memory = {
+--- a/drivers/usb/gadget/pxa2xx_udc.c
++++ b/drivers/usb/gadget/pxa2xx_udc.c
+@@ -1813,7 +1813,7 @@ pxa2xx_udc_irq(int irq, void *_dev)
+ 
+ static void nop_release (struct device *dev)
+ {
+-	DMSG("%s %s\n", __func__, dev->bus_id);
++	DMSG("%s %s\n", __func__, dev_name(dev));
+ }
+ 
+ /* this uses load-time allocation and initialization (instead of
+--- a/drivers/usb/host/ehci-dbg.c
++++ b/drivers/usb/host/ehci-dbg.c
+@@ -676,7 +676,7 @@ static ssize_t fill_registers_buffer(str
+ 			"%s\n"
+ 			"SUSPENDED (no register access)\n",
+ 			hcd->self.controller->bus->name,
+-			hcd->self.controller->bus_id,
++			dev_name(hcd->self.controller),
+ 			hcd->product_desc);
+ 		goto done;
+ 	}
+@@ -688,7 +688,7 @@ static ssize_t fill_registers_buffer(str
+ 		"%s\n"
+ 		"EHCI %x.%02x, hcd state %d\n",
+ 		hcd->self.controller->bus->name,
+-		hcd->self.controller->bus_id,
++		dev_name(hcd->self.controller),
+ 		hcd->product_desc,
+ 		i >> 8, i & 0x0ff, hcd->state);
+ 	size -= temp;
+--- a/drivers/usb/host/ehci-fsl.c
++++ b/drivers/usb/host/ehci-fsl.c
+@@ -56,7 +56,7 @@ int usb_hcd_fsl_probe(const struct hc_dr
+ 	pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data;
+ 	if (!pdata) {
+ 		dev_err(&pdev->dev,
+-			"No platform data for %s.\n", pdev->dev.bus_id);
++			"No platform data for %s.\n", dev_name(&pdev->dev));
+ 		return -ENODEV;
+ 	}
+ 
+@@ -69,7 +69,7 @@ int usb_hcd_fsl_probe(const struct hc_dr
+ 	      (pdata->operating_mode == FSL_USB2_DR_OTG))) {
+ 		dev_err(&pdev->dev,
+ 			"Non Host Mode configured for %s. Wrong driver linked.\n",
+-			pdev->dev.bus_id);
++			dev_name(&pdev->dev));
+ 		return -ENODEV;
+ 	}
+ 
+@@ -77,12 +77,12 @@ int usb_hcd_fsl_probe(const struct hc_dr
+ 	if (!res) {
+ 		dev_err(&pdev->dev,
+ 			"Found HC with no IRQ. Check %s setup!\n",
+-			pdev->dev.bus_id);
++			dev_name(&pdev->dev));
+ 		return -ENODEV;
+ 	}
+ 	irq = res->start;
+ 
+-	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		retval = -ENOMEM;
+ 		goto err1;
+@@ -92,7 +92,7 @@ int usb_hcd_fsl_probe(const struct hc_dr
+ 	if (!res) {
+ 		dev_err(&pdev->dev,
+ 			"Found HC with no register addr. Check %s setup!\n",
+-			pdev->dev.bus_id);
++			dev_name(&pdev->dev));
+ 		retval = -ENODEV;
+ 		goto err2;
+ 	}
+@@ -132,7 +132,7 @@ int usb_hcd_fsl_probe(const struct hc_dr
+       err2:
+ 	usb_put_hcd(hcd);
+       err1:
+-	dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, retval);
++	dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval);
+ 	return retval;
+ }
+ 
+--- a/drivers/usb/host/ehci-ixp4xx.c
++++ b/drivers/usb/host/ehci-ixp4xx.c
+@@ -77,12 +77,12 @@ static int ixp4xx_ehci_probe(struct plat
+ 	if (!res) {
+ 		dev_err(&pdev->dev,
+ 			"Found HC with no IRQ. Check %s setup!\n",
+-			pdev->dev.bus_id);
++			dev_name(&pdev->dev));
+ 		return -ENODEV;
+ 	}
+ 	irq = res->start;
+ 
+-	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		retval = -ENOMEM;
+ 		goto fail_create_hcd;
+@@ -92,7 +92,7 @@ static int ixp4xx_ehci_probe(struct plat
+ 	if (!res) {
+ 		dev_err(&pdev->dev,
+ 			"Found HC with no register addr. Check %s setup!\n",
+-			pdev->dev.bus_id);
++			dev_name(&pdev->dev));
+ 		retval = -ENODEV;
+ 		goto fail_request_resource;
+ 	}
+@@ -126,7 +126,7 @@ fail_ioremap:
+ fail_request_resource:
+ 	usb_put_hcd(hcd);
+ fail_create_hcd:
+-	dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, retval);
++	dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval);
+ 	return retval;
+ }
+ 
+--- a/drivers/usb/host/ehci-orion.c
++++ b/drivers/usb/host/ehci-orion.c
+@@ -204,7 +204,7 @@ static int __init ehci_orion_drv_probe(s
+ 	if (irq <= 0) {
+ 		dev_err(&pdev->dev,
+ 			"Found HC with no IRQ. Check %s setup!\n",
+-			pdev->dev.bus_id);
++			dev_name(&pdev->dev));
+ 		err = -ENODEV;
+ 		goto err1;
+ 	}
+@@ -213,7 +213,7 @@ static int __init ehci_orion_drv_probe(s
+ 	if (!res) {
+ 		dev_err(&pdev->dev,
+ 			"Found HC with no register addr. Check %s setup!\n",
+-			pdev->dev.bus_id);
++			dev_name(&pdev->dev));
+ 		err = -ENODEV;
+ 		goto err1;
+ 	}
+@@ -233,7 +233,7 @@ static int __init ehci_orion_drv_probe(s
+ 	}
+ 
+ 	hcd = usb_create_hcd(&ehci_orion_hc_driver,
+-			&pdev->dev, pdev->dev.bus_id);
++			&pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		err = -ENOMEM;
+ 		goto err3;
+@@ -276,7 +276,7 @@ err2:
+ 	release_mem_region(res->start, res->end - res->start + 1);
+ err1:
+ 	dev_err(&pdev->dev, "init %s fail, %d\n",
+-		pdev->dev.bus_id, err);
++		dev_name(&pdev->dev), err);
+ 
+ 	return err;
+ }
+--- a/drivers/usb/host/ehci-ps3.c
++++ b/drivers/usb/host/ehci-ps3.c
+@@ -128,7 +128,7 @@ static int ps3_ehci_probe(struct ps3_sys
+ 
+ 	dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */
+ 
+-	hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev->core.bus_id);
++	hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev_name(&dev->core));
+ 
+ 	if (!hcd) {
+ 		dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__,
+--- a/drivers/usb/host/isp116x-hcd.c
++++ b/drivers/usb/host/isp116x-hcd.c
+@@ -1592,7 +1592,7 @@ static int __devinit isp116x_probe(struc
+ 	}
+ 
+ 	/* allocate and initialize hcd */
+-	hcd = usb_create_hcd(&isp116x_hc_driver, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd(&isp116x_hc_driver, &pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		ret = -ENOMEM;
+ 		goto err5;
+--- a/drivers/usb/host/isp1760-if.c
++++ b/drivers/usb/host/isp1760-if.c
+@@ -41,7 +41,7 @@ static int of_isp1760_probe(struct of_de
+ 		return -ENXIO;
+ 
+ 	res = request_mem_region(memory.start, memory.end - memory.start + 1,
+-			dev->dev.bus_id);
++			dev_name(&dev->dev));
+ 	if (!res)
+ 		return -EBUSY;
+ 
+@@ -56,7 +56,7 @@ static int of_isp1760_probe(struct of_de
+ 			oirq.size);
+ 
+ 	hcd = isp1760_register(memory.start, res_len, virq,
+-		IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev->dev.bus_id);
++		IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev));
+ 	if (IS_ERR(hcd)) {
+ 		ret = PTR_ERR(hcd);
+ 		goto release_reg;
+@@ -200,7 +200,7 @@ static int __devinit isp1761_pci_probe(s
+ 
+ 	dev->dev.dma_mask = NULL;
+ 	hcd = isp1760_register(pci_mem_phy0, length, dev->irq,
+-		IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev->dev.bus_id);
++		IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev));
+ 	pci_set_drvdata(dev, hcd);
+ 	if (!hcd)
+ 		return 0;
+--- a/drivers/usb/host/ohci-dbg.c
++++ b/drivers/usb/host/ohci-dbg.c
+@@ -651,7 +651,7 @@ static ssize_t fill_registers_buffer(str
+ 		"%s\n"
+ 		"%s version " DRIVER_VERSION "\n",
+ 		hcd->self.controller->bus->name,
+-		hcd->self.controller->bus_id,
++		dev_name(hcd->self.controller),
+ 		hcd->product_desc,
+ 		hcd_name);
+ 
+--- a/drivers/usb/host/ohci-omap.c
++++ b/drivers/usb/host/ohci-omap.c
+@@ -326,7 +326,7 @@ static int usb_hcd_omap_probe (const str
+ 	}
+ 
+ 
+-	hcd = usb_create_hcd (driver, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd (driver, &pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		retval = -ENOMEM;
+ 		goto err0;
+--- a/drivers/usb/host/ohci-pnx4008.c
++++ b/drivers/usb/host/ohci-pnx4008.c
+@@ -388,7 +388,7 @@ static int __devinit usb_hcd_pnx4008_pro
+ 	while ((__raw_readl(USB_OTG_CLK_STAT) & USB_CLOCK_MASK) !=
+ 	       USB_CLOCK_MASK) ;
+ 
+-	hcd = usb_create_hcd (driver, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd (driver, &pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		err("Failed to allocate HC buffer");
+ 		ret = -ENOMEM;
+--- a/drivers/usb/host/ohci-ps3.c
++++ b/drivers/usb/host/ohci-ps3.c
+@@ -128,7 +128,7 @@ static int ps3_ohci_probe(struct ps3_sys
+ 
+ 	dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */
+ 
+-	hcd = usb_create_hcd(&ps3_ohci_hc_driver, &dev->core, dev->core.bus_id);
++	hcd = usb_create_hcd(&ps3_ohci_hc_driver, &dev->core, dev_name(&dev->core));
+ 
+ 	if (!hcd) {
+ 		dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__,
+--- a/drivers/usb/host/ohci-sm501.c
++++ b/drivers/usb/host/ohci-sm501.c
+@@ -142,7 +142,7 @@ static int ohci_hcd_sm501_drv_probe(stru
+ 		goto err2;
+ 	}
+ 
+-	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		retval = -ENOMEM;
+ 		goto err2;
+--- a/drivers/usb/host/ohci-ssb.c
++++ b/drivers/usb/host/ohci-ssb.c
+@@ -112,7 +112,7 @@ static int ssb_ohci_attach(struct ssb_de
+ 	ssb_device_enable(dev, flags);
+ 
+ 	hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
+-			dev->dev->bus_id);
++			dev_name(dev->dev));
+ 	if (!hcd)
+ 		goto err_dev_disable;
+ 	ohcidev = hcd_to_ssb_ohci(hcd);
+--- a/drivers/usb/host/sl811-hcd.c
++++ b/drivers/usb/host/sl811-hcd.c
+@@ -1674,7 +1674,7 @@ sl811h_probe(struct platform_device *dev
+ 	}
+ 
+ 	/* allocate and initialize hcd */
+-	hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev->dev.bus_id);
++	hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev_name(&dev->dev));
+ 	if (!hcd) {
+ 		retval = -ENOMEM;
+ 		goto err5;
+--- a/drivers/usb/host/u132-hcd.c
++++ b/drivers/usb/host/u132-hcd.c
+@@ -3113,7 +3113,7 @@ static int __devinit u132_probe(struct p
+ 	if (pdev->dev.dma_mask)
+ 		return -EINVAL;
+ 
+-	hcd = usb_create_hcd(&u132_hc_driver, &pdev->dev, pdev->dev.bus_id);
++	hcd = usb_create_hcd(&u132_hc_driver, &pdev->dev, dev_name(&pdev->dev));
+ 	if (!hcd) {
+ 		printk(KERN_ERR "failed to create the usb hcd struct for U132\n"
+ 			);
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
+@@ -505,7 +505,7 @@ static void port_release(struct device *
+ {
+ 	struct usb_serial_port *port = to_usb_serial_port(dev);
+ 
+-	dbg ("%s - %s", __func__, dev->bus_id);
++	dbg ("%s - %s", __func__, dev_name(dev));
+ 	port_free(port);
+ }
+ 
+@@ -939,7 +939,7 @@ int usb_serial_probe(struct usb_interfac
+ 		port->dev.release = &port_release;
+ 
+ 		snprintf (&port->dev.bus_id[0], sizeof(port->dev.bus_id), "ttyUSB%d", port->number);
+-		dbg ("%s - registering %s", __func__, port->dev.bus_id);
++		dbg ("%s - registering %s", __func__, dev_name(&port->dev));
+ 		retval = device_register(&port->dev);
+ 		if (retval)
+ 			dev_err(&port->dev, "Error registering port device, "
diff --git a/usb/usb-usb-dev_set_name-instead-of-dev-bus_id.patch b/usb/usb-usb-dev_set_name-instead-of-dev-bus_id.patch
new file mode 100644
index 00000000000000..a2a4d626d026b9
--- /dev/null
+++ b/usb/usb-usb-dev_set_name-instead-of-dev-bus_id.patch
@@ -0,0 +1,183 @@
+From kay.sievers@vrfy.org Fri May  2 09:28:43 2008
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Fri, 02 May 2008 06:02:41 +0200
+Subject: USB: usb dev_set_name() instead of dev->bus_id
+Message-ID: <1209700961.3100.6.camel@linux.site>
+
+The bus_id field is going away, use the dev_set_name() function
+to set it properly.
+
+Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/endpoint.c       |    2 +-
+ drivers/usb/core/message.c        |    2 +-
+ drivers/usb/core/usb.c            |    5 ++---
+ drivers/usb/gadget/amd5536udc.c   |    2 +-
+ drivers/usb/gadget/dummy_hcd.c    |    2 +-
+ drivers/usb/gadget/file_storage.c |    4 ++--
+ drivers/usb/gadget/fsl_usb2_udc.c |    2 +-
+ drivers/usb/gadget/goku_udc.c     |    2 +-
+ drivers/usb/gadget/m66592-udc.c   |    2 +-
+ drivers/usb/gadget/net2280.c      |    2 +-
+ drivers/usb/gadget/omap_udc.c     |    2 +-
+ drivers/usb/host/isp1760-hcd.c    |    2 +-
+ drivers/usb/serial/usb-serial.c   |    2 +-
+ 13 files changed, 15 insertions(+), 16 deletions(-)
+
+--- a/drivers/usb/core/endpoint.c
++++ b/drivers/usb/core/endpoint.c
+@@ -307,7 +307,7 @@ int usb_create_ep_files(struct device *p
+ 	ep_dev->dev.class = ep_class->class;
+ 	ep_dev->dev.parent = parent;
+ 	ep_dev->dev.release = ep_device_release;
+-	snprintf(ep_dev->dev.bus_id, BUS_ID_SIZE, "usbdev%d.%d_ep%02x",
++	dev_set_name(&ep_dev->dev, "usbdev%d.%d_ep%02x",
+ 		 udev->bus->busnum, udev->devnum,
+ 		 endpoint->desc.bEndpointAddress);
+ 
+--- a/drivers/usb/core/message.c
++++ b/drivers/usb/core/message.c
+@@ -1611,7 +1611,7 @@ free_interfaces:
+ 		intf->dev.dma_mask = dev->dev.dma_mask;
+ 		device_initialize(&intf->dev);
+ 		mark_quiesced(intf);
+-		sprintf(&intf->dev.bus_id[0], "%d-%s:%d.%d",
++		dev_set_name(&intf->dev, "%d-%s:%d.%d",
+ 			dev->bus->busnum, dev->devpath,
+ 			configuration, alt->desc.bInterfaceNumber);
+ 	}
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -316,7 +316,7 @@ struct usb_device *usb_alloc_dev(struct 
+ 		dev->devpath[0] = '0';
+ 
+ 		dev->dev.parent = bus->controller;
+-		sprintf(&dev->dev.bus_id[0], "usb%d", bus->busnum);
++		dev_set_name(&dev->dev, "usb%d", bus->busnum);
+ 		root_hub = 1;
+ 	} else {
+ 		/* match any labeling on the hubs; it's one-based */
+@@ -328,8 +328,7 @@ struct usb_device *usb_alloc_dev(struct 
+ 				"%s.%d", parent->devpath, port1);
+ 
+ 		dev->dev.parent = &parent->dev;
+-		sprintf(&dev->dev.bus_id[0], "%d-%s",
+-			bus->busnum, dev->devpath);
++		dev_set_name(&dev->dev, "%d-%s", bus->busnum, dev->devpath);
+ 
+ 		/* hub driver sets up TT records */
+ 	}
+--- a/drivers/usb/gadget/amd5536udc.c
++++ b/drivers/usb/gadget/amd5536udc.c
+@@ -3342,7 +3342,7 @@ static int udc_probe(struct udc *dev)
+ 	spin_lock_init(&dev->lock);
+ 	dev->gadget.ops = &udc_ops;
+ 
+-	strcpy(dev->gadget.dev.bus_id, "gadget");
++	dev_set_name(&dev->gadget.dev, "gadget");
+ 	dev->gadget.dev.release = gadget_release;
+ 	dev->gadget.name = name;
+ 	dev->gadget.name = name;
+--- a/drivers/usb/gadget/dummy_hcd.c
++++ b/drivers/usb/gadget/dummy_hcd.c
+@@ -862,7 +862,7 @@ static int dummy_udc_probe (struct platf
+ 	/* maybe claim OTG support, though we won't complete HNP */
+ 	dum->gadget.is_otg = (dummy_to_hcd(dum)->self.otg_port != 0);
+ 
+-	strcpy (dum->gadget.dev.bus_id, "gadget");
++	dev_set_name(&dum->gadget.dev, "gadget");
+ 	dum->gadget.dev.parent = &pdev->dev;
+ 	dum->gadget.dev.release = dummy_gadget_release;
+ 	rc = device_register (&dum->gadget.dev);
+--- a/drivers/usb/gadget/file_storage.c
++++ b/drivers/usb/gadget/file_storage.c
+@@ -3867,8 +3867,8 @@ static int __init fsg_bind(struct usb_ga
+ 		curlun->dev.parent = &gadget->dev;
+ 		curlun->dev.driver = &fsg_driver.driver;
+ 		dev_set_drvdata(&curlun->dev, fsg);
+-		snprintf(curlun->dev.bus_id, BUS_ID_SIZE,
+-				"%s-lun%d", dev_name(&gadget->dev), i);
++		dev_set_name(&curlun->dev,"%s-lun%d",
++			     dev_name(&gadget->dev), i);
+ 
+ 		if ((rc = device_register(&curlun->dev)) != 0) {
+ 			INFO(fsg, "failed to register LUN%d: %d\n", i, rc);
+--- a/drivers/usb/gadget/fsl_usb2_udc.c
++++ b/drivers/usb/gadget/fsl_usb2_udc.c
+@@ -2331,7 +2331,7 @@ static int __init fsl_udc_probe(struct p
+ 	udc_controller->gadget.name = driver_name;
+ 
+ 	/* Setup gadget.dev and register with kernel */
+-	strcpy(udc_controller->gadget.dev.bus_id, "gadget");
++	dev_set_name(&udc_controller->gadget.dev, "gadget");
+ 	udc_controller->gadget.dev.release = fsl_udc_release;
+ 	udc_controller->gadget.dev.parent = &pdev->dev;
+ 	ret = device_register(&udc_controller->gadget.dev);
+--- a/drivers/usb/gadget/goku_udc.c
++++ b/drivers/usb/gadget/goku_udc.c
+@@ -1790,7 +1790,7 @@ static int goku_probe(struct pci_dev *pd
+ 	dev->gadget.ops = &goku_ops;
+ 
+ 	/* the "gadget" abstracts/virtualizes the controller */
+-	strcpy(dev->gadget.dev.bus_id, "gadget");
++	dev_set_name(&dev->gadget.dev, "gadget");
+ 	dev->gadget.dev.parent = &pdev->dev;
+ 	dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
+ 	dev->gadget.dev.release = gadget_release;
+--- a/drivers/usb/gadget/m66592-udc.c
++++ b/drivers/usb/gadget/m66592-udc.c
+@@ -1593,7 +1593,7 @@ static int __init m66592_probe(struct pl
+ 
+ 	m66592->gadget.ops = &m66592_gadget_ops;
+ 	device_initialize(&m66592->gadget.dev);
+-	strcpy(m66592->gadget.dev.bus_id, "gadget");
++	dev_set_name(&m66592->gadget, "gadget");
+ 	m66592->gadget.is_dualspeed = 1;
+ 	m66592->gadget.dev.parent = &pdev->dev;
+ 	m66592->gadget.dev.dma_mask = pdev->dev.dma_mask;
+--- a/drivers/usb/gadget/net2280.c
++++ b/drivers/usb/gadget/net2280.c
+@@ -2768,7 +2768,7 @@ static int net2280_probe (struct pci_dev
+ 	dev->gadget.is_dualspeed = 1;
+ 
+ 	/* the "gadget" abstracts/virtualizes the controller */
+-	strcpy (dev->gadget.dev.bus_id, "gadget");
++	dev_set_name(&dev->gadget.dev, "gadget");
+ 	dev->gadget.dev.parent = &pdev->dev;
+ 	dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
+ 	dev->gadget.dev.release = gadget_release;
+--- a/drivers/usb/gadget/omap_udc.c
++++ b/drivers/usb/gadget/omap_udc.c
+@@ -2662,7 +2662,7 @@ omap_udc_setup(struct platform_device *o
+ 	udc->gadget.name = driver_name;
+ 
+ 	device_initialize(&udc->gadget.dev);
+-	strcpy (udc->gadget.dev.bus_id, "gadget");
++	dev_set_name(&udc->gadget.dev, "gadget");
+ 	udc->gadget.dev.release = omap_udc_release;
+ 	udc->gadget.dev.parent = &odev->dev;
+ 	if (use_dma)
+--- a/drivers/usb/host/isp1760-hcd.c
++++ b/drivers/usb/host/isp1760-hcd.c
+@@ -2195,7 +2195,7 @@ struct usb_hcd *isp1760_register(u64 res
+ 	/* prevent usb-core allocating DMA pages */
+ 	dev->dma_mask = NULL;
+ 
+-	hcd = usb_create_hcd(&isp1760_hc_driver, dev, dev->bus_id);
++	hcd = usb_create_hcd(&isp1760_hc_driver, dev, dev_name(dev));
+ 	if (!hcd)
+ 		return ERR_PTR(-ENOMEM);
+ 
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
+@@ -938,7 +938,7 @@ int usb_serial_probe(struct usb_interfac
+ 		port->dev.bus = &usb_serial_bus_type;
+ 		port->dev.release = &port_release;
+ 
+-		snprintf (&port->dev.bus_id[0], sizeof(port->dev.bus_id), "ttyUSB%d", port->number);
++		dev_set_name(&port->dev, "ttyUSB%d", port->number);
+ 		dbg ("%s - registering %s", __func__, dev_name(&port->dev));
+ 		retval = device_register(&port->dev);
+ 		if (retval)
author	Greg Kroah-Hartman <gregkh@suse.de>	2008-06-11 11:38:03 -0700
committer	Greg Kroah-Hartman <gregkh@suse.de>	2008-06-11 11:38:03 -0700
commit	4639b8f792579cbf5b835097c4fdb14b68542c49 (patch)
tree	fef3e5a2f04ca32671a7133abfc56b05897bd2b6 /usb
parent	33c9cb3493fbb0f8f04e729a28aa9ec799d662aa (diff)
download	patches-4639b8f792579cbf5b835097c4fdb14b68542c49.tar.gz