Browse Source

USB: handle pci_name() being const

This changes usb_create_hcd() to be able to handle the fact that
pci_name() has changed to a constant string.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman 17 years ago
parent
commit
1b26da1510
3 changed files with 3 additions and 3 deletions
  1. 1 1
      drivers/usb/core/hcd.c
  2. 1 1
      drivers/usb/core/hcd.h
  3. 1 1
      include/linux/usb.h

+ 1 - 1
drivers/usb/core/hcd.c

@@ -1764,7 +1764,7 @@ EXPORT_SYMBOL_GPL (usb_hc_died);
  * If memory is unavailable, returns NULL.
  * If memory is unavailable, returns NULL.
  */
  */
 struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,
 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;
 	struct usb_hcd *hcd;
 
 

+ 1 - 1
drivers/usb/core/hcd.h

@@ -235,7 +235,7 @@ extern void usb_hcd_disable_endpoint(struct usb_device *udev,
 extern int usb_hcd_get_frame_number(struct usb_device *udev);
 extern int usb_hcd_get_frame_number(struct usb_device *udev);
 
 
 extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
 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 struct usb_hcd *usb_get_hcd(struct usb_hcd *hcd);
 extern void usb_put_hcd(struct usb_hcd *hcd);
 extern void usb_put_hcd(struct usb_hcd *hcd);
 extern int usb_add_hcd(struct usb_hcd *hcd,
 extern int usb_add_hcd(struct usb_hcd *hcd,

+ 1 - 1
include/linux/usb.h

@@ -293,7 +293,7 @@ struct usb_devmap {
 struct usb_bus {
 struct usb_bus {
 	struct device *controller;	/* host/master side hardware */
 	struct device *controller;	/* host/master side hardware */
 	int busnum;			/* Bus number (in order of reg) */
 	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 uses_dma;			/* Does the host controller use DMA? */
 	u8 otg_port;			/* 0, or number of OTG/HNP port */
 	u8 otg_port;			/* 0, or number of OTG/HNP port */
 	unsigned is_b_host:1;		/* true during some HNP roleswitches */
 	unsigned is_b_host:1;		/* true during some HNP roleswitches */