Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB merge for 3.9-rc1

  Nothing major, lots of gadget fixes, and of course, xhci stuff.

  All of this has been in linux-next for a while, with the exception of
  the last 3 patches, which were reverts of patches in the tree that
  caused problems, they went in yesterday."

* tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits)
  Revert "USB: EHCI: make ehci-vt8500 a separate driver"
  Revert "USB: EHCI: make ehci-orion a separate driver"
  Revert "USB: update host controller Kconfig entries"
  USB: update host controller Kconfig entries
  USB: EHCI: make ehci-orion a separate driver
  USB: EHCI: make ehci-vt8500 a separate driver
  USB: usb-storage: unusual_devs update for Super TOP SATA bridge
  USB: ehci-omap: Fix autoloading of module
  USB: ehci-omap: Don't free gpios that we didn't request
  USB: option: add Huawei "ACM" devices using protocol = vendor
  USB: serial: fix null-pointer dereferences on disconnect
  USB: option: add Yota / Megafon M100-1 4g modem
  drivers/usb: add missing GENERIC_HARDIRQS dependencies
  USB: storage: properly handle the endian issues of idProduct
  testusb: remove all mentions of 'usbfs'
  usb: gadget: imx_udc: make it depend on BROKEN
  usb: omap_control_usb: fix compile warning
  ARM: OMAP: USB: Add phy binding information
  ARM: OMAP2: MUSB: Specify omap4 has mailbox
  ARM: OMAP: devices: create device for usb part of control module
  ...

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 94ca33bb990b..458965a1b138 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -435,7 +435,7 @@ static void s3c_hsudc_epin_intr(struct s3c_hsudc *hsudc, u32 ep_idx)
         struct s3c_hsudc_req *hsreq;
         u32 csr;
 
-        csr = readl((u32)hsudc->regs + S3C_ESR);
+        csr = readl(hsudc->regs + S3C_ESR);
         if (csr & S3C_ESR_STALL) {
                 writel(S3C_ESR_STALL, hsudc->regs + S3C_ESR);
                 return;
@@ -468,7 +468,7 @@ static void s3c_hsudc_epout_intr(struct s3c_hsudc *hsudc, u32 ep_idx)
         struct s3c_hsudc_req *hsreq;
         u32 csr;
 
-        csr = readl((u32)hsudc->regs + S3C_ESR);
+        csr = readl(hsudc->regs + S3C_ESR);
         if (csr & S3C_ESR_STALL) {
                 writel(S3C_ESR_STALL, hsudc->regs + S3C_ESR);
                 return;
@@ -901,12 +901,12 @@ static int s3c_hsudc_queue(struct usb_ep *_ep, struct usb_request *_req,
         if (list_empty(&hsep->queue) && !hsep->stopped) {
                 offset = (ep_index(hsep)) ? S3C_ESR : S3C_EP0SR;
                 if (ep_is_in(hsep)) {
-                        csr = readl((u32)hsudc->regs + offset);
+                        csr = readl(hsudc->regs + offset);
                         if (!(csr & S3C_ESR_TX_SUCCESS) &&
                                 (s3c_hsudc_write_fifo(hsep, hsreq) == 1))
                                 hsreq = NULL;
                 } else {
-                        csr = readl((u32)hsudc->regs + offset);
+                        csr = readl(hsudc->regs + offset);
                         if ((csr & S3C_ESR_RX_SUCCESS)
                                    && (s3c_hsudc_read_fifo(hsep, hsreq) == 1))
                                 hsreq = NULL;
@@ -1254,7 +1254,7 @@ static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
         return -EOPNOTSUPP;
 }
 
-static struct usb_gadget_ops s3c_hsudc_gadget_ops = {
+static const struct usb_gadget_ops s3c_hsudc_gadget_ops = {
         .get_frame      = s3c_hsudc_gadget_getframe,
         .udc_start      = s3c_hsudc_start,
         .udc_stop       = s3c_hsudc_stop,
@@ -1286,7 +1286,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
         for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++)
                 hsudc->supplies[i].supply = s3c_hsudc_supply_names[i];
 
-        ret = regulator_bulk_get(dev, ARRAY_SIZE(hsudc->supplies),
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsudc->supplies),
                                  hsudc->supplies);
         if (ret != 0) {
                 dev_err(dev, "failed to request supplies: %d\n", ret);
@@ -1366,7 +1366,6 @@ err_res:
         if (!IS_ERR_OR_NULL(hsudc->transceiver))
                 usb_put_phy(hsudc->transceiver);
 
-        regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
 err_supplies:
         return ret;
 }