Commit 9da51974 authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

usb: dwc2: Cleanup some checkpatch issues 



This commmit is the result of running checkpatch --fix.

The results were verified for correctness. Some of the fixes result in
line over 80 char which we will fix manually later.

The following is a summary of what was done by checkpatch:
* Remove externs on function prototypes.
* Replace symbolic permissions with octal.
* Align code to open parens.
* Replace 'unsigned' with 'unsigned int'.
* Remove unneccessary blank lines.
* Add blank lines after declarations.
* Add spaces around operators.
* Remove unnecessary spaces after casts.
* Replace 'x == NULL' with '!x'.
* Replace kzalloc() with kcalloc().
* Concatenate multi-line strings.
* Use the BIT() macro.

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 33e4c1a9

drivers/usb/dwc2/core.c

+11 −11
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ void dwc2_disable_global_interrupts(struct dwc2_hsotg *hsotg) 
}



/* Returns the controller's GHWCFG2.OTG_MODE. */

unsigned dwc2_op_mode(struct dwc2_hsotg *hsotg)

unsigned int dwc2_op_mode(struct dwc2_hsotg *hsotg)

{

	u32 ghwcfg2 = dwc2_readl(hsotg->regs + GHWCFG2);
@@ -804,7 +804,7 @@ unsigned dwc2_op_mode(struct dwc2_hsotg *hsotg) 
/* Returns true if the controller is capable of DRD. */

bool dwc2_hw_is_otg(struct dwc2_hsotg *hsotg)

{

	unsigned op_mode = dwc2_op_mode(hsotg);

	unsigned int op_mode = dwc2_op_mode(hsotg);



	return (op_mode == GHWCFG2_OP_MODE_HNP_SRP_CAPABLE) ||

		(op_mode == GHWCFG2_OP_MODE_SRP_ONLY_CAPABLE) ||
@@ -814,7 +814,7 @@ bool dwc2_hw_is_otg(struct dwc2_hsotg *hsotg) 
/* Returns true if the controller is host-only. */

bool dwc2_hw_is_host(struct dwc2_hsotg *hsotg)

{

	unsigned op_mode = dwc2_op_mode(hsotg);

	unsigned int op_mode = dwc2_op_mode(hsotg);



	return (op_mode == GHWCFG2_OP_MODE_SRP_CAPABLE_HOST) ||

		(op_mode == GHWCFG2_OP_MODE_NO_SRP_CAPABLE_HOST);
@@ -823,7 +823,7 @@ bool dwc2_hw_is_host(struct dwc2_hsotg *hsotg) 
/* Returns true if the controller is device-only. */

bool dwc2_hw_is_device(struct dwc2_hsotg *hsotg)

{

	unsigned op_mode = dwc2_op_mode(hsotg);

	unsigned int op_mode = dwc2_op_mode(hsotg);



	return (op_mode == GHWCFG2_OP_MODE_SRP_CAPABLE_DEVICE) ||

		(op_mode == GHWCFG2_OP_MODE_NO_SRP_CAPABLE_DEVICE);

drivers/usb/dwc2/core.h

+35 −34
Original line number Diff line number Diff line
@@ -1101,37 +1101,37 @@ static inline bool dwc2_is_hs_iot(struct dwc2_hsotg *hsotg) 
 * The following functions support initialization of the core driver component

 * and the DWC_otg controller

 */

extern int dwc2_core_reset(struct dwc2_hsotg *hsotg);

extern int dwc2_core_reset_and_force_dr_mode(struct dwc2_hsotg *hsotg);

extern int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg);

extern int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore);

int dwc2_core_reset(struct dwc2_hsotg *hsotg);

int dwc2_core_reset_and_force_dr_mode(struct dwc2_hsotg *hsotg);

int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg);

int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore);



bool dwc2_force_mode_if_needed(struct dwc2_hsotg *hsotg, bool host);

void dwc2_clear_force_mode(struct dwc2_hsotg *hsotg);

void dwc2_force_dr_mode(struct dwc2_hsotg *hsotg);



extern bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg);

bool dwc2_is_controller_alive(struct dwc2_hsotg *hsotg);



/*

 * Common core Functions.

 * The following functions support managing the DWC_otg controller in either

 * device or host mode.

 */

extern void dwc2_read_packet(struct dwc2_hsotg *hsotg, u8 *dest, u16 bytes);

extern void dwc2_flush_tx_fifo(struct dwc2_hsotg *hsotg, const int num);

extern void dwc2_flush_rx_fifo(struct dwc2_hsotg *hsotg);

void dwc2_read_packet(struct dwc2_hsotg *hsotg, u8 *dest, u16 bytes);

void dwc2_flush_tx_fifo(struct dwc2_hsotg *hsotg, const int num);

void dwc2_flush_rx_fifo(struct dwc2_hsotg *hsotg);



extern void dwc2_enable_global_interrupts(struct dwc2_hsotg *hcd);

extern void dwc2_disable_global_interrupts(struct dwc2_hsotg *hcd);

void dwc2_enable_global_interrupts(struct dwc2_hsotg *hcd);

void dwc2_disable_global_interrupts(struct dwc2_hsotg *hcd);



/* This function should be called on every hardware interrupt. */

extern irqreturn_t dwc2_handle_common_intr(int irq, void *dev);

irqreturn_t dwc2_handle_common_intr(int irq, void *dev);



/* The device ID match table */

extern const struct of_device_id dwc2_of_match_table[];



extern int dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg);

extern int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg);

int dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg);

int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg);



/* Parameters */

int dwc2_get_hwparams(struct dwc2_hsotg *hsotg);
@@ -1145,7 +1145,7 @@ int dwc2_init_params(struct dwc2_hsotg *hsotg); 
 * are read in and cached so they always read directly from the

 * GHWCFG2 register.

 */

unsigned dwc2_op_mode(struct dwc2_hsotg *hsotg);

unsigned int dwc2_op_mode(struct dwc2_hsotg *hsotg);

bool dwc2_hw_is_otg(struct dwc2_hsotg *hsotg);

bool dwc2_hw_is_host(struct dwc2_hsotg *hsotg);

bool dwc2_hw_is_device(struct dwc2_hsotg *hsotg);
@@ -1157,6 +1157,7 @@ static inline int dwc2_is_host_mode(struct dwc2_hsotg *hsotg) 
{

	return (dwc2_readl(hsotg->regs + GINTSTS) & GINTSTS_CURMODE_HOST) != 0;

}



static inline int dwc2_is_device_mode(struct dwc2_hsotg *hsotg)

{

	return (dwc2_readl(hsotg->regs + GINTSTS) & GINTSTS_CURMODE_HOST) == 0;
@@ -1165,26 +1166,26 @@ static inline int dwc2_is_device_mode(struct dwc2_hsotg *hsotg) 
/*

 * Dump core registers and SPRAM

 */

extern void dwc2_dump_dev_registers(struct dwc2_hsotg *hsotg);

extern void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg);

extern void dwc2_dump_global_registers(struct dwc2_hsotg *hsotg);

void dwc2_dump_dev_registers(struct dwc2_hsotg *hsotg);

void dwc2_dump_host_registers(struct dwc2_hsotg *hsotg);

void dwc2_dump_global_registers(struct dwc2_hsotg *hsotg);



/*

 * Return OTG version - either 1.3 or 2.0

 */

extern u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg);

u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg);



/* Gadget defines */

#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)

extern int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);

extern int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2);

extern int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2);

extern int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq);

extern void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,

int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);

int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2);

int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2);

int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq);

void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,

				       bool reset);

extern void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);

extern void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2);

extern int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);

void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);

void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2);

int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);

#define dwc2_is_device_connected(hsotg) (hsotg->connected)

int dwc2_backup_device_registers(struct dwc2_hsotg *hsotg);

int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg);
@@ -1212,11 +1213,11 @@ static inline int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg) 
#endif



#if IS_ENABLED(CONFIG_USB_DWC2_HOST) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)

extern int dwc2_hcd_get_frame_number(struct dwc2_hsotg *hsotg);

extern int dwc2_hcd_get_future_frame_number(struct dwc2_hsotg *hsotg, int us);

extern void dwc2_hcd_connect(struct dwc2_hsotg *hsotg);

extern void dwc2_hcd_disconnect(struct dwc2_hsotg *hsotg, bool force);

extern void dwc2_hcd_start(struct dwc2_hsotg *hsotg);

int dwc2_hcd_get_frame_number(struct dwc2_hsotg *hsotg);

int dwc2_hcd_get_future_frame_number(struct dwc2_hsotg *hsotg, int us);

void dwc2_hcd_connect(struct dwc2_hsotg *hsotg);

void dwc2_hcd_disconnect(struct dwc2_hsotg *hsotg, bool force);

void dwc2_hcd_start(struct dwc2_hsotg *hsotg);

int dwc2_backup_host_registers(struct dwc2_hsotg *hsotg);

int dwc2_restore_host_registers(struct dwc2_hsotg *hsotg);

#else

drivers/usb/dwc2/debug.h

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include "core.h"



#ifdef CONFIG_DEBUG_FS

extern int dwc2_debugfs_init(struct dwc2_hsotg *);

extern void dwc2_debugfs_exit(struct dwc2_hsotg *);

int dwc2_debugfs_init(struct dwc2_hsotg *);

void dwc2_debugfs_exit(struct dwc2_hsotg *);

#else

static inline int dwc2_debugfs_init(struct dwc2_hsotg *hsotg)

{  return 0;  }

drivers/usb/dwc2/debugfs.c

+13 −13
Original line number Diff line number Diff line
@@ -338,23 +338,23 @@ static void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg) 
{

	struct dentry *root;

	struct dentry *file;

	unsigned epidx;

	unsigned int epidx;



	root = hsotg->debug_root;



	/* create general state file */



	file = debugfs_create_file("state", S_IRUGO, root, hsotg, &state_fops);

	file = debugfs_create_file("state", 0444, root, hsotg, &state_fops);

	if (IS_ERR(file))

		dev_err(hsotg->dev, "%s: failed to create state\n", __func__);



	file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root, hsotg,

	file = debugfs_create_file("testmode", 0644, root, hsotg,

				   &testmode_fops);

	if (IS_ERR(file))

		dev_err(hsotg->dev, "%s: failed to create testmode\n",

			__func__);



	file = debugfs_create_file("fifo", S_IRUGO, root, hsotg, &fifo_fops);

	file = debugfs_create_file("fifo", 0444, root, hsotg, &fifo_fops);

	if (IS_ERR(file))

		dev_err(hsotg->dev, "%s: failed to create fifo\n", __func__);
@@ -364,7 +364,7 @@ static void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg) 


		ep = hsotg->eps_out[epidx];

		if (ep) {

			file = debugfs_create_file(ep->name, S_IRUGO,

			file = debugfs_create_file(ep->name, 0444,

						   root, ep, &ep_fops);

			if (IS_ERR(file))

				dev_err(hsotg->dev, "failed to create %s debug file\n",
@@ -377,7 +377,7 @@ static void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg) 


		ep = hsotg->eps_in[epidx];

		if (ep) {

			file = debugfs_create_file(ep->name, S_IRUGO,

			file = debugfs_create_file(ep->name, 0444,

						   root, ep, &ep_fops);

			if (IS_ERR(file))

				dev_err(hsotg->dev, "failed to create %s debug file\n",
@@ -750,7 +750,7 @@ int dwc2_debugfs_init(struct dwc2_hsotg *hsotg) 
	hsotg->regset->nregs = ARRAY_SIZE(dwc2_regs);

	hsotg->regset->base = hsotg->regs;



	file = debugfs_create_regset32("regdump", S_IRUGO, hsotg->debug_root,

	file = debugfs_create_regset32("regdump", 0444, hsotg->debug_root,

				       hsotg->regset);

	if (!file) {

		ret = -ENOMEM;

drivers/usb/dwc2/gadget.c

+70 −72
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ static void dwc2_hsotg_unmap_dma(struct dwc2_hsotg *hsotg, 
				struct dwc2_hsotg_req *hs_req)

{

	struct usb_request *req = &hs_req->req;



	usb_gadget_unmap_request(&hsotg->gadget, req, hs_ep->dir_in);

}
@@ -547,11 +548,11 @@ static int dwc2_hsotg_write_fifo(struct dwc2_hsotg *hsotg, 
 * Return the maximum data that can be queued in one go on a given endpoint

 * so that transfers that are too long can be split.

 */

static unsigned get_ep_limit(struct dwc2_hsotg_ep *hs_ep)

static unsigned int get_ep_limit(struct dwc2_hsotg_ep *hs_ep)

{

	int index = hs_ep->index;

	unsigned maxsize;

	unsigned maxpkt;

	unsigned int maxsize;

	unsigned int maxpkt;



	if (index != 0) {

		maxsize = DXEPTSIZ_XFERSIZE_LIMIT + 1;
@@ -885,9 +886,9 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, 
	u32 epsize_reg;

	u32 epsize;

	u32 ctrl;

	unsigned length;

	unsigned packets;

	unsigned maxreq;

	unsigned int length;

	unsigned int packets;

	unsigned int maxreq;

	unsigned int dma_reg;



	if (index != 0) {
@@ -1889,7 +1890,6 @@ static void dwc2_hsotg_complete_request(struct dwc2_hsotg *hsotg, 
				       struct dwc2_hsotg_req *hs_req,

				       int result)

{



	if (!hs_req) {

		dev_dbg(hsotg->dev, "%s: nothing to complete?\n", __func__);

		return;
@@ -2068,7 +2068,6 @@ static void dwc2_hsotg_rx_data(struct dwc2_hsotg *hsotg, int ep_idx, int size) 
	int max_req;

	int read_ptr;





	if (!hs_req) {

		u32 epctl = dwc2_readl(hsotg->regs + DOEPCTL(ep_idx));

		int ptr;
@@ -2191,7 +2190,7 @@ static void dwc2_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum) 
	struct dwc2_hsotg_ep *hs_ep = hsotg->eps_out[epnum];

	struct dwc2_hsotg_req *hs_req = hs_ep->req;

	struct usb_request *req = &hs_req->req;

	unsigned size_left = DXEPTSIZ_XFERSIZE_GET(epsize);

	unsigned int size_left = DXEPTSIZ_XFERSIZE_GET(epsize);

	int result = 0;



	if (!hs_req) {
@@ -2210,7 +2209,7 @@ static void dwc2_hsotg_handle_outdone(struct dwc2_hsotg *hsotg, int epnum) 
		size_left = dwc2_gadget_get_xfersize_ddma(hs_ep);



	if (using_dma(hsotg)) {

		unsigned size_done;

		unsigned int size_done;



		/*

		 * Calculate the size of the transfer by checking how much
@@ -3059,7 +3058,7 @@ static void kill_all_requests(struct dwc2_hsotg *hsotg, 
			      int result)

{

	struct dwc2_hsotg_req *req, *treq;

	unsigned size;

	unsigned int size;



	ep->req = NULL;
@@ -3084,7 +3083,7 @@ static void kill_all_requests(struct dwc2_hsotg *hsotg, 
 */

void dwc2_hsotg_disconnect(struct dwc2_hsotg *hsotg)

{

	unsigned ep;

	unsigned int ep;



	if (!hsotg->connected)

		return;
@@ -3462,7 +3461,6 @@ irq_retry: 
	}



	if (gintsts & (GINTSTS_USBRST | GINTSTS_RESETDET)) {



		u32 usb_status = dwc2_readl(hsotg->regs + GOTGCTL);

		u32 connected = hsotg->connected;
@@ -3827,6 +3825,7 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep, 
	if (dir_in && hsotg->dedicated_fifos) {

		u32 fifo_index = 0;

		u32 fifo_size = UINT_MAX;



		size = hs_ep->ep.maxpacket * hs_ep->mc;

		for (i = 1; i < hsotg->num_of_eps; ++i) {

			if (hsotg->fifo_map & (1 << i))
@@ -4046,7 +4045,6 @@ static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now) 
		}

		dwc2_writel(epctl, hs->regs + epreg);

	} else {



		epreg = DOEPCTL(index);

		epctl = dwc2_readl(hs->regs + epreg);
@@ -4098,7 +4096,7 @@ static struct usb_ep_ops dwc2_hsotg_ep_ops = { 
};



/**

 * dwc2_hsotg_init - initalize the usb core

 * dwc2_hsotg_init - initialize the usb core

 * @hsotg: The driver state

 */

static void dwc2_hsotg_init(struct dwc2_hsotg *hsotg)
@@ -4337,7 +4335,7 @@ static int dwc2_hsotg_vbus_session(struct usb_gadget *gadget, int is_active) 
 *

 * Report how much power the device may consume to the phy.

 */

static int dwc2_hsotg_vbus_draw(struct usb_gadget *gadget, unsigned mA)

static int dwc2_hsotg_vbus_draw(struct usb_gadget *gadget, unsigned int mA)

{

	struct dwc2_hsotg *hsotg = to_hsotg(gadget);
@@ -4423,6 +4421,7 @@ static void dwc2_hsotg_initep(struct dwc2_hsotg *hsotg, 


	if (using_dma(hsotg)) {

		u32 next = DXEPCTL_NEXTEP((epnum + 1) % 15);



		if (dir_in)

			dwc2_writel(next, hsotg->regs + DIEPCTL(epnum));

		else
@@ -4529,7 +4528,6 @@ static void dwc2_hsotg_dump(struct dwc2_hsotg *hsotg) 
			 idx, dwc2_readl(regs + DOEPCTL(idx)),

			 dwc2_readl(regs + DOEPTSIZ(idx)),

			 dwc2_readl(regs + DOEPDMA(idx)));



	}



	dev_info(dev, "DVBUSDIS=0x%08x, DVBUSPULSE=%08x\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE