]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
usb: gadged: pch_udc: get rid of redundant assignments
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 18 Mar 2016 14:55:37 +0000 (16:55 +0200)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Mon, 18 Apr 2016 12:23:37 +0000 (15:23 +0300)
It seems there are leftovers of some assignments which are not used
anymore.  Compiler even warns us about:

drivers/usb/gadget/udc/pch_udc.c:2022:22: warning: variable ‘dev’ set \
but not used [-Wunused-but-set-variable]

drivers/usb/gadget/udc/pch_udc.c:2639:9: warning: variable ‘ret’ set \
but not used [-Wunused-but-set-variable]

Remove them and shut compiler about.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/gadget/udc/pch_udc.c

index 787f459e9e90a9c1c457119265fe16a155516f09..d6d1418bdd63af800533d23e5ab875a83ad8acda 100644 (file)
@@ -1719,14 +1719,12 @@ static int pch_udc_pcd_ep_enable(struct usb_ep *usbep,
 static int pch_udc_pcd_ep_disable(struct usb_ep *usbep)
 {
        struct pch_udc_ep       *ep;
-       struct pch_udc_dev      *dev;
        unsigned long   iflags;
 
        if (!usbep)
                return -EINVAL;
 
        ep = container_of(usbep, struct pch_udc_ep, ep);
-       dev = ep->dev;
        if ((usbep->name == ep0_string) || !ep->ep.desc)
                return -EINVAL;
 
@@ -1757,12 +1755,10 @@ static struct usb_request *pch_udc_alloc_request(struct usb_ep *usbep,
        struct pch_udc_request          *req;
        struct pch_udc_ep               *ep;
        struct pch_udc_data_dma_desc    *dma_desc;
-       struct pch_udc_dev              *dev;
 
        if (!usbep)
                return NULL;
        ep = container_of(usbep, struct pch_udc_ep, ep);
-       dev = ep->dev;
        req = kzalloc(sizeof *req, gfp);
        if (!req)
                return NULL;
@@ -1935,12 +1931,10 @@ static int pch_udc_pcd_dequeue(struct usb_ep *usbep,
 {
        struct pch_udc_ep       *ep;
        struct pch_udc_request  *req;
-       struct pch_udc_dev      *dev;
        unsigned long           flags;
        int ret = -EINVAL;
 
        ep = container_of(usbep, struct pch_udc_ep, ep);
-       dev = ep->dev;
        if (!usbep || !usbreq || (!ep->ep.desc && ep->num))
                return ret;
        req = container_of(usbreq, struct pch_udc_request, req);
@@ -1972,14 +1966,12 @@ static int pch_udc_pcd_dequeue(struct usb_ep *usbep,
 static int pch_udc_pcd_set_halt(struct usb_ep *usbep, int halt)
 {
        struct pch_udc_ep       *ep;
-       struct pch_udc_dev      *dev;
        unsigned long iflags;
        int ret;
 
        if (!usbep)
                return -EINVAL;
        ep = container_of(usbep, struct pch_udc_ep, ep);
-       dev = ep->dev;
        if (!ep->ep.desc && !ep->num)
                return -EINVAL;
        if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN))
@@ -2017,14 +2009,12 @@ static int pch_udc_pcd_set_halt(struct usb_ep *usbep, int halt)
 static int pch_udc_pcd_set_wedge(struct usb_ep *usbep)
 {
        struct pch_udc_ep       *ep;
-       struct pch_udc_dev      *dev;
        unsigned long iflags;
        int ret;
 
        if (!usbep)
                return -EINVAL;
        ep = container_of(usbep, struct pch_udc_ep, ep);
-       dev = ep->dev;
        if (!ep->ep.desc && !ep->num)
                return -EINVAL;
        if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN))
@@ -2634,7 +2624,7 @@ static void pch_udc_svc_enum_interrupt(struct pch_udc_dev *dev)
 static void pch_udc_svc_intf_interrupt(struct pch_udc_dev *dev)
 {
        u32 reg, dev_stat = 0;
-       int i, ret;
+       int i;
 
        dev_stat = pch_udc_read_device_status(dev);
        dev->cfg_data.cur_intf = (dev_stat & UDC_DEVSTS_INTF_MASK) >>
@@ -2663,7 +2653,7 @@ static void pch_udc_svc_intf_interrupt(struct pch_udc_dev *dev)
        }
        dev->stall = 0;
        spin_lock(&dev->lock);
-       ret = dev->driver->setup(&dev->gadget, &dev->setup_data);
+       dev->driver->setup(&dev->gadget, &dev->setup_data);
        spin_unlock(&dev->lock);
 }
 
@@ -2674,7 +2664,7 @@ static void pch_udc_svc_intf_interrupt(struct pch_udc_dev *dev)
  */
 static void pch_udc_svc_cfg_interrupt(struct pch_udc_dev *dev)
 {
-       int i, ret;
+       int i;
        u32 reg, dev_stat = 0;
 
        dev_stat = pch_udc_read_device_status(dev);
@@ -2700,7 +2690,7 @@ static void pch_udc_svc_cfg_interrupt(struct pch_udc_dev *dev)
 
        /* call gadget zero with setup data received */
        spin_lock(&dev->lock);
-       ret = dev->driver->setup(&dev->gadget, &dev->setup_data);
+       dev->driver->setup(&dev->gadget, &dev->setup_data);
        spin_unlock(&dev->lock);
 }