iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: gadged: pch_udc: get rid of redundant assignments

Browse Source 
commit 6b968737c3 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko
2016-03-18 16:55:37 +02:00
committed by Greg Kroah-Hartman
parent bb630aaad7
commit f2f8b4655a
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/usb/gadget/udc/pch_udc.c
View File

@ -1731,14 +1731,12 @@ static int pch_udc_pcd_ep_enable(struct usb_ep *usbep,
static int pch_udc_pcd_ep_disable(struct usb_ep *usbep) static int pch_udc_pcd_ep_disable(struct usb_ep *usbep)
{ {
struct pch_udc_ep *ep; struct pch_udc_ep *ep;
struct pch_udc_dev *dev;
unsigned long iflags; unsigned long iflags;
if (!usbep) if (!usbep)
return -EINVAL; return -EINVAL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev;
if ((usbep->name == ep0_string) || !ep->ep.desc) if ((usbep->name == ep0_string) || !ep->ep.desc)
return -EINVAL; return -EINVAL;
@ -1769,12 +1767,10 @@ static struct usb_request *pch_udc_alloc_request(struct usb_ep *usbep,
struct pch_udc_request *req; struct pch_udc_request *req;
struct pch_udc_ep *ep; struct pch_udc_ep *ep;
struct pch_udc_data_dma_desc *dma_desc; struct pch_udc_data_dma_desc *dma_desc;
struct pch_udc_dev *dev;
if (!usbep) if (!usbep)
return NULL; return NULL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev;
req = kzalloc(sizeof *req, gfp); req = kzalloc(sizeof *req, gfp);
if (!req) if (!req)
return NULL; return NULL;
@ -1947,12 +1943,10 @@ static int pch_udc_pcd_dequeue(struct usb_ep *usbep,
{ {
struct pch_udc_ep *ep; struct pch_udc_ep *ep;
struct pch_udc_request *req; struct pch_udc_request *req;
struct pch_udc_dev *dev;
unsigned long flags; unsigned long flags;
int ret = -EINVAL; int ret = -EINVAL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev;
if (!usbep || !usbreq || (!ep->ep.desc && ep->num)) if (!usbep || !usbreq || (!ep->ep.desc && ep->num))
return ret; return ret;
req = container_of(usbreq, struct pch_udc_request, req); req = container_of(usbreq, struct pch_udc_request, req);
@ -1984,14 +1978,12 @@ static int pch_udc_pcd_dequeue(struct usb_ep *usbep,
static int pch_udc_pcd_set_halt(struct usb_ep *usbep, int halt) static int pch_udc_pcd_set_halt(struct usb_ep *usbep, int halt)
{ {
struct pch_udc_ep *ep; struct pch_udc_ep *ep;
struct pch_udc_dev *dev;
unsigned long iflags; unsigned long iflags;
int ret; int ret;
if (!usbep) if (!usbep)
return -EINVAL; return -EINVAL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev;
if (!ep->ep.desc && !ep->num) if (!ep->ep.desc && !ep->num)
return -EINVAL; return -EINVAL;
if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN)) if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN))
@ -2029,14 +2021,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) static int pch_udc_pcd_set_wedge(struct usb_ep *usbep)
{ {
struct pch_udc_ep *ep; struct pch_udc_ep *ep;
struct pch_udc_dev *dev;
unsigned long iflags; unsigned long iflags;
int ret; int ret;
if (!usbep) if (!usbep)
return -EINVAL; return -EINVAL;
ep = container_of(usbep, struct pch_udc_ep, ep); ep = container_of(usbep, struct pch_udc_ep, ep);
dev = ep->dev;
if (!ep->ep.desc && !ep->num) if (!ep->ep.desc && !ep->num)
return -EINVAL; return -EINVAL;
if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN)) if (!ep->dev->driver || (ep->dev->gadget.speed == USB_SPEED_UNKNOWN))
@ -2646,7 +2636,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) static void pch_udc_svc_intf_interrupt(struct pch_udc_dev *dev)
{ {
u32 reg, dev_stat = 0; u32 reg, dev_stat = 0;
int i, ret; int i;
dev_stat = pch_udc_read_device_status(dev); dev_stat = pch_udc_read_device_status(dev);
dev->cfg_data.cur_intf = (dev_stat & UDC_DEVSTS_INTF_MASK) >> dev->cfg_data.cur_intf = (dev_stat & UDC_DEVSTS_INTF_MASK) >>
@ -2675,7 +2665,7 @@ static void pch_udc_svc_intf_interrupt(struct pch_udc_dev *dev)
} }
dev->stall = 0; dev->stall = 0;
spin_lock(&dev->lock); 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); spin_unlock(&dev->lock);
} }
@ -2686,7 +2676,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) static void pch_udc_svc_cfg_interrupt(struct pch_udc_dev *dev)
{ {
int i, ret; int i;
u32 reg, dev_stat = 0; u32 reg, dev_stat = 0;
dev_stat = pch_udc_read_device_status(dev); dev_stat = pch_udc_read_device_status(dev);
@ -2712,7 +2702,7 @@ static void pch_udc_svc_cfg_interrupt(struct pch_udc_dev *dev)
/* call gadget zero with setup data received */ /* call gadget zero with setup data received */
spin_lock(&dev->lock); 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); spin_unlock(&dev->lock);
} }