diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-11-04 12:32:47 +0200 | 
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-12-12 11:48:29 +0200 | 
| commit | 25b8ff68bf1d4954d4a9dcb4862c6b6a53cb09e2 (patch) | |
| tree | 450f0d681ae8bc836e8e7843cfb01e3dd54ccddf /drivers/usb | |
| parent | 4878a02898bab1a988206341e529997cb46e5f29 (diff) | |
| download | olio-linux-3.10-25b8ff68bf1d4954d4a9dcb4862c6b6a53cb09e2.tar.xz olio-linux-3.10-25b8ff68bf1d4954d4a9dcb4862c6b6a53cb09e2.zip  | |
usb: dwc3: fix few coding style problems
There were a few coding style issues with this driver
which are now fixed:
drivers/usb/dwc3/debugfs.c:48: WARNING: Use #include \
	<linux/uaccess.h> instead of <asm/uaccess.h>
drivers/usb/dwc3/debugfs.c:484: ERROR: space required \
	before the open brace '{'
drivers/usb/dwc3/ep0.c:261: WARNING: line over 80 characters
drivers/usb/dwc3/ep0.c:287: WARNING: suspect code indent \
	for conditional statements (16, 23)
drivers/usb/dwc3/gadget.c:749: WARNING: line over 80 characters
drivers/usb/dwc3/gadget.c:1267: WARNING: line over 80 characters
drivers/usb/dwc3/gadget.h:116: WARNING: line over 80 characters
drivers/usb/dwc3/io.h:42: WARNING: Use #include \
	<linux/io.h> instead of <asm/io.h>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/dwc3/debugfs.c | 5 | ||||
| -rw-r--r-- | drivers/usb/dwc3/ep0.c | 5 | ||||
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 10 | ||||
| -rw-r--r-- | drivers/usb/dwc3/gadget.h | 3 | ||||
| -rw-r--r-- | drivers/usb/dwc3/io.h | 2 | 
5 files changed, 13 insertions, 12 deletions
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c index ca4be0afc33..e78abb438b4 100644 --- a/drivers/usb/dwc3/debugfs.c +++ b/drivers/usb/dwc3/debugfs.c @@ -44,8 +44,7 @@  #include <linux/debugfs.h>  #include <linux/seq_file.h>  #include <linux/delay.h> - -#include <asm/uaccess.h> +#include <linux/uaccess.h>  #include "core.h"  #include "gadget.h" @@ -481,7 +480,7 @@ int __devinit dwc3_debugfs_init(struct dwc3 *dwc)  	int			ret;  	root = debugfs_create_dir(dev_name(dwc->dev), NULL); -	if (IS_ERR(root)){ +	if (IS_ERR(root)) {  		ret = PTR_ERR(root);  		goto err0;  	} diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 7da25e18188..861a41aa87d 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -258,7 +258,8 @@ static void dwc3_ep0_status_cmpl(struct usb_ep *ep, struct usb_request *req)  /*   * ch 9.4.5   */ -static int dwc3_ep0_handle_status(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) +static int dwc3_ep0_handle_status(struct dwc3 *dwc, +		struct usb_ctrlrequest *ctrl)  {  	struct dwc3_ep		*dep;  	u32			recip; @@ -285,7 +286,7 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl  	case USB_RECIP_ENDPOINT:  		dep = dwc3_wIndex_to_dep(dwc, ctrl->wIndex);  		if (!dep) -		       return -EINVAL; +			return -EINVAL;  		if (dep->flags & DWC3_EP_STALL)  			usb_status = 1 << USB_ENDPOINT_HALT; diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 8aff490a1ae..9497fa5e392 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -745,8 +745,9 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,  	dep->flags |= DWC3_EP_BUSY;  	dep->res_trans_idx = dwc3_gadget_ep_get_transfer_index(dwc,  			dep->number); -	if (!dep->res_trans_idx) -		printk_once(KERN_ERR "%s() res_trans_idx is invalid\n", __func__); + +	WARN_ON_ONCE(!dep->res_trans_idx); +  	return 0;  } @@ -1264,11 +1265,10 @@ static int __devinit dwc3_gadget_init_endpoints(struct dwc3 *dwc)  					&dwc->gadget.ep_list);  			ret = dwc3_alloc_trb_pool(dep); -			if (ret) { -				dev_err(dwc->dev, "%s: failed to allocate TRB pool\n", dep->name); +			if (ret)  				return ret; -			}  		} +  		INIT_LIST_HEAD(&dep->request_list);  		INIT_LIST_HEAD(&dep->req_queued);  	} diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index 5c4a56f055e..4cdaf02ead5 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -113,7 +113,8 @@ static inline void dwc3_gadget_move_request_queued(struct dwc3_request *req)  void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,  		int status); -void dwc3_ep0_interrupt(struct dwc3 *dwc, const struct dwc3_event_depevt *event); +void dwc3_ep0_interrupt(struct dwc3 *dwc, +		const struct dwc3_event_depevt *event);  void dwc3_ep0_out_start(struct dwc3 *dwc);  int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,  		gfp_t gfp_flags); diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h index bc957db1ea4..071d561f3e6 100644 --- a/drivers/usb/dwc3/io.h +++ b/drivers/usb/dwc3/io.h @@ -39,7 +39,7 @@  #ifndef __DRIVERS_USB_DWC3_IO_H  #define __DRIVERS_USB_DWC3_IO_H -#include <asm/io.h> +#include <linux/io.h>  static inline u32 dwc3_readl(void __iomem *base, u32 offset)  {  |