lkml.org 
[lkml]   [2008]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 04/04] 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>

    ---
    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
    @@ -1755,7 +1755,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 */
    --


    \
     
     \ /
      Last update: 2008-07-02 22:29    [W:0.020 / U:31.156 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site