[PATCH 00/23] General checkpatch.pl cleanup for twl and musb drivers

[PATCH 00/23] General checkpatch.pl cleanup for twl and musb drivers

[Felipe Balbi]

The following series gets rid of checkpatch.pl ERRORS and WARNINGS
for both twl4030 and musb drivers. I left some WARNINGS in musb_core.c
because fixing them would decrease the code readability. Line was only one
character over the 80 max so it didn't make sense to fix that.

Felipe Balbi (23):
  I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c
  I2C: TWL4030: checkpatch.pl fixes for twl4030-usb.c
  I2C: TWL4030: checkpatch.pl fixes for twl4030-gpio.c
  I2C: TWL4030: checkpatch.pl fixes to tlw4030.h
  I2C: TLW4030: checkpatch.pl fixes to tlw4030-rtc.h
  I2C: TWL4030: checkpatch.pl fixes to rtc-twl4030.c
  USB: MUSB: checkpatch.pl fixes to cppi_dma.c
  USB: MUSB: checkpatch.pl fixes to davinci.c
  USB: MUSB: checkpatch.pl fixed to musb_core.c
  USB: MUSB: checkpatch.pl fixes to musb_gadget.c
  USB: MUSB: checkpatch.pl fixed to musb_gadget_ep0.c
  USB: MUSB: checkpatch.pl fixed to musb_host.c
  USB: MUSB: checkpatch.pl fixed to musb_procfs.c
  USB: MUSB: checkpatch.pl fixes to musb_virthub.c
  USB: MUSB: checkpatch.pl fixes to musbhsdma.c
  USB: MUSB: checkpatch.pl fixes to omap2430.c
  USB: MUSB: checkpatch.pl fixes to tusb6010.c
  USB: MUSB: checkpatch.pl fixes to tusb6010_omap.c
  USB: MUSB: checkpatch.pl fixes to davinci.h
  USB: MUSB: checkpatch.pl fixes to musb_core.h
  USB: MUSB: checkpatch.pl fixes to musb_io.h
  USB: MUSB: checkpatch.pl fixed to musb_regs.h
  USB: MUSB: checkpatch.pl fixes to musb_debug.h

 drivers/i2c/chips/twl4030-core.c   |   61 +++++++++++++---------------
 drivers/i2c/chips/twl4030-gpio.c   |   37 ++++++++---------
 drivers/i2c/chips/twl4030-usb.c    |    3 +-
 drivers/rtc/rtc-twl4030.c          |   77 ++++++++++++++++++-----------------
 drivers/usb/musb/cppi_dma.c        |    2 +-
 drivers/usb/musb/davinci.c         |    8 ++--
 drivers/usb/musb/davinci.h         |    4 +-
 drivers/usb/musb/musb_core.c       |   35 +++++++---------
 drivers/usb/musb/musb_core.h       |   10 ++--
 drivers/usb/musb/musb_debug.h      |   14 +++---
 drivers/usb/musb/musb_gadget.c     |   13 +++---
 drivers/usb/musb/musb_gadget_ep0.c |    2 +-
 drivers/usb/musb/musb_host.c       |   26 ++++++------
 drivers/usb/musb/musb_io.h         |    2 +-
 drivers/usb/musb/musb_procfs.c     |    8 ++--
 drivers/usb/musb/musb_regs.h       |   22 +++++-----
 drivers/usb/musb/musb_virthub.c    |    4 +-
 drivers/usb/musb/musbhsdma.c       |   17 ++++----
 drivers/usb/musb/omap2430.c        |    2 +-
 drivers/usb/musb/tusb6010.c        |   12 +++---
 drivers/usb/musb/tusb6010_omap.c   |   13 +++---
 include/linux/i2c/twl4030-rtc.h    |    4 +-
 include/linux/i2c/twl4030.h        |    6 +-
 23 files changed, 186 insertions(+), 196 deletions(-)

[PATCH 01/23] I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/i2c/chips/twl4030-core.c |   61 +++++++++++++++++--------------------
 1 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c
index 49bd63a..953c247 100644
--- a/drivers/i2c/chips/twl4030-core.c
+++ b/drivers/i2c/chips/twl4030-core.c
@@ -43,8 +43,8 @@
 #include <linux/slab.h>
 #include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/irq.h>
 
-#include <asm/irq.h>
 #include <asm/mach/irq.h>
 
 #include <asm/arch/gpio.h>
@@ -256,7 +256,7 @@ static struct irq_chip twl4030_irq_chip = {
  *
  * @return result of operation - 0 is success
  */
-int twl4030_i2c_write(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
+int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, u8 num_bytes)
 {
 	int ret;
 	int sid;
@@ -295,6 +295,7 @@ int twl4030_i2c_write(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
 		ret = 0;
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_i2c_write);
 
 /**
  * @brief twl4030_i2c_read - Reads a n bit register in TWL4030
@@ -306,7 +307,7 @@ int twl4030_i2c_write(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
  *
  * @return result of operation - num_bytes is success else failure.
  */
-int twl4030_i2c_read(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
+int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, u8 num_bytes)
 {
 	int ret;
 	u8 val;
@@ -348,6 +349,7 @@ int twl4030_i2c_read(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
 		ret = 0;
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_i2c_read);
 
 /**
  * @brief twl4030_i2c_write_u8 - Writes a 8 bit register in TWL4030
@@ -367,6 +369,7 @@ int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
 	temp_buffer[1] = value;
 	return twl4030_i2c_write(mod_no, temp_buffer, reg, 1);
 }
+EXPORT_SYMBOL(twl4030_i2c_write_u8);
 
 /**
  * @brief twl4030_i2c_read_u8 - Reads a 8 bit register from TWL4030
@@ -377,10 +380,11 @@ int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
  *
  * @return result of operation - 0 is success
  */
-int twl4030_i2c_read_u8(u8 mod_no, u8 * value, u8 reg)
+int twl4030_i2c_read_u8(u8 mod_no, u8 *value, u8 reg)
 {
 	return twl4030_i2c_read(mod_no, value, reg, 1);
 }
+EXPORT_SYMBOL(twl4030_i2c_read_u8);
 
 /* Helper Functions */
 
@@ -431,7 +435,8 @@ static void do_twl4030_module_irq(unsigned int irq, irq_desc_t *desc)
 
 			if (retval != IRQ_HANDLED)
 				printk(KERN_ERR "ISR for TWL4030 module"
-					" irq %d can't handle interrupt\n", irq);
+					" irq %d can't handle interrupt\n",
+					irq);
 
 			/*
 			 * Here is where we should call the unmask method, but
@@ -475,7 +480,7 @@ static int twl4030_irq_thread(void *data)
 			if (++i2c_errors >= max_i2c_errors) {
 				printk(KERN_ERR "Maximum I2C error count"
 						" exceeded.  Terminating %s.\n",
-						__FUNCTION__);
+						__func__);
 				break;
 			}
 			continue;
@@ -542,8 +547,10 @@ static int twl4030_detect_client(struct i2c_adapter *adapter, unsigned char sid)
 	}
 
 	/* Check basic functionality */
-	if (!(err = i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA |
-						I2C_FUNC_SMBUS_WRITE_BYTE))) {
+	err = i2c_check_functionality(adapter,
+			I2C_FUNC_SMBUS_WORD_DATA
+			| I2C_FUNC_SMBUS_WRITE_BYTE);
+	if (!err) {
 		pr_err("SlaveID=%d functionality check failed\n", sid);
 		return err;
 	}
@@ -565,7 +572,8 @@ static int twl4030_detect_client(struct i2c_adapter *adapter, unsigned char sid)
 	pr_info("TWL4030: TRY attach Slave %s on Adapter %s [%x]\n",
 				twl->client_name, adapter->name, err);
 
-	if ((err = i2c_attach_client(&twl->client))) {
+	err = i2c_attach_client(&twl->client);
+	if (err) {
 		pr_err("Couldn't attach Slave %s on Adapter"
 		       "%s [%x]\n", twl->client_name, adapter->name, err);
 	} else {
@@ -586,7 +594,8 @@ static int twl4030_attach_adapter(struct i2c_adapter *adapter)
 	for (i = 0; i < TWL4030_NUM_SLAVES; i++) {
 		/* Check if I need to hook on to this adapter or not */
 		if (twl4030_modules[i].adapter_index == twl_i2c_adapter) {
-			if ((ret = twl4030_detect_client(adapter, i)))
+			ret = twl4030_detect_client(adapter, i);
+			if (ret)
 				goto free_client;
 		}
 	}
@@ -604,7 +613,7 @@ static int twl4030_attach_adapter(struct i2c_adapter *adapter)
 	return 0;
 
 free_client:
-	pr_err("TWL_CLIENT(Idx=%d] registration failed[0x%x]\n",i,ret);
+	pr_err("TWL_CLIENT(Idx=%d] registration failed[0x%x]\n", i, ret);
 
 	/* ignore current slave..it never got registered */
 	i--;
@@ -621,7 +630,8 @@ free_client:
 static int twl4030_detach_client(struct i2c_client *client)
 {
 	int err;
-	if ((err = i2c_detach_client(client))) {
+	err = i2c_detach_client(client);
+	if (err) {
 		pr_err("Client detach failed\n");
 		return err;
 	}
@@ -637,7 +647,7 @@ struct task_struct *start_twl4030_irq_thread(int irq)
 			     "twl4030 irq %d", irq);
 	if (!thread)
 		pr_err("%s: could not create twl4030 irq %d thread!\n",
-		       __FUNCTION__, irq);
+		       __func__, irq);
 
 	return thread;
 }
@@ -686,9 +696,9 @@ static int power_companion_init(void)
 	clk_put(osc);
 
 	switch (rate) {
-		case 19200000 : ctrl = HFCLK_FREQ_19p2_MHZ; break;
-		case 26000000 : ctrl = HFCLK_FREQ_26_MHZ; break;
-		case 38400000 : ctrl = HFCLK_FREQ_38p4_MHZ; break;
+	case 19200000 : ctrl = HFCLK_FREQ_19p2_MHZ; break;
+	case 26000000 : ctrl = HFCLK_FREQ_26_MHZ; break;
+	case 38400000 : ctrl = HFCLK_FREQ_38p4_MHZ; break;
 	}
 
 	ctrl |= HIGH_PERF_SQ;
@@ -875,23 +885,13 @@ static void twl_init_irq(void)
 	set_irq_chained_handler(TWL4030_IRQNUM, do_twl4030_irq);
 
 	res = power_companion_init();
-	if (res < 0) {
+	if (res < 0)
 		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
-	}
 }
 
 static int __init twl4030_init(void)
 {
-	int res;
-
-	if ((res = i2c_add_driver(&twl4030_driver))) {
-		printk(KERN_ERR "TWL4030: Driver registration failed\n");
-		return res;
-	}
-
-	pr_info(KERN_INFO "TWL4030: Driver registration complete.\n");
-
-	return 0;
+	return i2c_add_driver(&twl4030_driver);
 }
 
 static void __exit twl4030_exit(void)
@@ -903,11 +903,6 @@ static void __exit twl4030_exit(void)
 subsys_initcall(twl4030_init);
 module_exit(twl4030_exit);
 
-EXPORT_SYMBOL(twl4030_i2c_write_u8);
-EXPORT_SYMBOL(twl4030_i2c_read_u8);
-EXPORT_SYMBOL(twl4030_i2c_read);
-EXPORT_SYMBOL(twl4030_i2c_write);
-
 MODULE_AUTHOR("Texas Instruments, Inc.");
 MODULE_DESCRIPTION("I2C Core interface for TWL4030");
 MODULE_LICENSE("GPL");
-- 
1.5.5.23.g2a5fe

[PATCH 02/23] I2C: TWL4030: checkpatch.pl fixes for twl4030-usb.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/i2c/chips/twl4030-usb.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-usb.c b/drivers/i2c/chips/twl4030-usb.c
index 1df5427..5cf1c5c 100644
--- a/drivers/i2c/chips/twl4030-usb.c
+++ b/drivers/i2c/chips/twl4030-usb.c
@@ -621,7 +621,8 @@ static int twl4030_set_suspend(struct otg_transceiver *x, int suspend)
 	return 0;
 }
 
-static int twl4030_set_peripheral(struct otg_transceiver *xceiv, struct usb_gadget *gadget)
+static int twl4030_set_peripheral(struct otg_transceiver *xceiv,
+		struct usb_gadget *gadget)
 {
 	struct twl4030_usb *twl = xceiv_to_twl(xceiv);
 
-- 
1.5.5.23.g2a5fe

[PATCH 03/23] I2C: TWL4030: checkpatch.pl fixes for twl4030-gpio.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/i2c/chips/twl4030-gpio.c |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-gpio.c b/drivers/i2c/chips/twl4030-gpio.c
index a9f3b1d..349cbda 100644
--- a/drivers/i2c/chips/twl4030-gpio.c
+++ b/drivers/i2c/chips/twl4030-gpio.c
@@ -34,13 +34,13 @@
 #include <linux/random.h>
 #include <linux/syscalls.h>
 #include <linux/kthread.h>
+#include <linux/irq.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c/twl4030.h>
 #include <linux/slab.h>
 
 #include <asm/arch/irqs.h>
-#include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
@@ -145,16 +145,16 @@
 #define GPIO_BANK_MAX			GET_GPIO_CTL_BANK(TWL4030_GPIO_MAX)
 
 /* GPIOPUPDCTRx Fields 5 banks of 4 gpios each */
-#define BIT_GPIOPUPDCTR1_GPIOxPD(x)	(2 *(x))
-#define MASK_GPIOPUPDCTR1_GPIOxPD(x)	(0x01 << (2*(x)))
+#define BIT_GPIOPUPDCTR1_GPIOxPD(x)	(2 * (x))
+#define MASK_GPIOPUPDCTR1_GPIOxPD(x)	(0x01 << (2 * (x)))
 #define BIT_GPIOPUPDCTR1_GPIOxPU(x)	((x) + 1)
-#define MASK_GPIOPUPDCTR1_GPIOxPU(x)	(0x01 << (((2*(x)) + 1)))
+#define MASK_GPIOPUPDCTR1_GPIOxPU(x)	(0x01 << (((2 * (x)) + 1)))
 
 /* GPIO_EDR1 Fields */
-#define BIT_GPIO_EDR1_GPIOxFALLING(x)	(2 *(x))
-#define MASK_GPIO_EDR1_GPIOxFALLING(x)	(0x01 << (2*(x)))
+#define BIT_GPIO_EDR1_GPIOxFALLING(x)	(2 * (x))
+#define MASK_GPIO_EDR1_GPIOxFALLING(x)	(0x01 << (2 * (x)))
 #define BIT_GPIO_EDR1_GPIOxRISING(x)	((x) + 1)
-#define MASK_GPIO_EDR1_GPIOxRISING(x)	(0x01 << (((2*(x)) + 1)))
+#define MASK_GPIO_EDR1_GPIOxRISING(x)	(0x01 << (((2 * (x)) + 1)))
 
 /* GPIO_SIH_CTRL Fields */
 #define BIT_GPIO_SIH_CTRL_EXCLEN	(0x000)
@@ -343,6 +343,7 @@ int twl4030_request_gpio(int gpio)
 	up(&gpio_sem);
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_request_gpio);
 
 /*
  * TWL4030 GPIO free module
@@ -368,6 +369,7 @@ int twl4030_free_gpio(int gpio)
 	up(&gpio_sem);
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_free_gpio);
 
 /*
  * Set direction for TWL4030 GPIO
@@ -399,6 +401,7 @@ int twl4030_set_gpio_direction(int gpio, int is_input)
 	up(&gpio_sem);
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_set_gpio_direction);
 
 /*
  * To enable/disable GPIO pin on TWL4030
@@ -424,6 +427,7 @@ int twl4030_set_gpio_dataout(int gpio, int enable)
 	up(&gpio_sem);
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_set_gpio_dataout);
 
 /*
  * To get the status of a GPIO pin on TWL4030
@@ -448,6 +452,7 @@ int twl4030_get_gpio_datain(int gpio)
 
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_get_gpio_datain);
 
 /*
  * Configure PULL type for a GPIO pin on TWL4030
@@ -484,6 +489,7 @@ int twl4030_set_gpio_pull(int gpio, int pull_dircn)
 	up(&gpio_sem);
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_set_gpio_pull);
 
 /*
  * Configure Edge control for a GPIO pin on TWL4030
@@ -523,6 +529,7 @@ int twl4030_set_gpio_edge_ctrl(int gpio, int edge)
 	up(&gpio_sem);
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_set_gpio_edge_ctrl);
 
 /*
  * Configure debounce timing value for a GPIO pin on TWL4030
@@ -553,6 +560,7 @@ int twl4030_set_gpio_debounce(int gpio, int enable)
 	up(&gpio_sem);
 	return ret;
 }
+EXPORT_SYMBOL(twl4030_set_gpio_debounce);
 
 /*
  * Configure Card detect for GPIO pin on TWL4030
@@ -583,6 +591,7 @@ int twl4030_set_gpio_card_detect(int gpio, int enable)
 	up(&gpio_sem);
 	return (ret);
 }
+EXPORT_SYMBOL(twl4030_set_gpio_card_detect);
 
 /* MODULE FUNCTIONS */
 
@@ -765,8 +774,8 @@ static int __init gpio_twl4030_init(void)
 			NULL, "twl4030 gpio");
 		if (!gpio_unmask_thread) {
 			printk(KERN_ERR
-				"%s: could not create twl4030 gpio unmask thread!\n",
-				__FUNCTION__);
+				"%s: could not create twl4030 gpio unmask"
+				" thread!\n", __func__);
 			ret = -ENOMEM;
 		}
 	}
@@ -821,16 +830,6 @@ static void __exit gpio_twl4030_exit(void)
 module_init(gpio_twl4030_init);
 module_exit(gpio_twl4030_exit);
 
-EXPORT_SYMBOL(twl4030_request_gpio);
-EXPORT_SYMBOL(twl4030_free_gpio);
-EXPORT_SYMBOL(twl4030_set_gpio_direction);
-EXPORT_SYMBOL(twl4030_set_gpio_dataout);
-EXPORT_SYMBOL(twl4030_get_gpio_datain);
-EXPORT_SYMBOL(twl4030_set_gpio_pull);
-EXPORT_SYMBOL(twl4030_set_gpio_edge_ctrl);
-EXPORT_SYMBOL(twl4030_set_gpio_debounce);
-EXPORT_SYMBOL(twl4030_set_gpio_card_detect);
-
 MODULE_AUTHOR("Texas Instruments, Inc.");
 MODULE_DESCRIPTION("GPIO interface for TWL4030");
 MODULE_LICENSE("GPL");
-- 
1.5.5.23.g2a5fe

[PATCH 04/23] I2C: TWL4030: checkpatch.pl fixes to tlw4030.h

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 include/linux/i2c/twl4030.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index fc11fd0..2452282 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -107,14 +107,14 @@
  * It is the caller's responsibility to ensure sane values
  */
 int twl4030_i2c_write_u8(u8 mod_no, u8 val, u8 reg);
-int twl4030_i2c_read_u8(u8 mod_no, u8* val, u8 reg);
+int twl4030_i2c_read_u8(u8 mod_no, u8 *val, u8 reg);
 
  /*
   * i2c_write: IMPORTANT - Allocate value num_bytes+1 and valid data starts at
   *		Offset 1.
   */
-int twl4030_i2c_write(u8 mod_no, u8 * value, u8 reg, u8 num_bytes);
-int twl4030_i2c_read(u8 mod_no, u8 * value, u8 reg, u8 num_bytes);
+int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, u8 num_bytes);
+int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, u8 num_bytes);
 
 /*
  * Exported TWL4030 GPIO APIs
-- 
1.5.5.23.g2a5fe

[PATCH 05/23] I2C: TLW4030: checkpatch.pl fixes to tlw4030-rtc.h

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 include/linux/i2c/twl4030-rtc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/i2c/twl4030-rtc.h b/include/linux/i2c/twl4030-rtc.h
index f3d96b3..fa74613 100644
--- a/include/linux/i2c/twl4030-rtc.h
+++ b/include/linux/i2c/twl4030-rtc.h
@@ -223,8 +223,8 @@
 
 
 struct twl4030rtc_platform_data {
-        int (*init)(void);
-        void (*exit)(void);
+	int (*init)(void);
+	void (*exit)(void);
 };
 
 #endif				/* End of __TWL4030_RTC_H__ */
-- 
1.5.5.23.g2a5fe

[PATCH 06/23] I2C: TWL4030: checkpatch.pl fixes to rtc-twl4030.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/rtc/rtc-twl4030.c |   77 +++++++++++++++++++++++---------------------
 1 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c
index ca026b1..ef0e175 100644
--- a/drivers/rtc/rtc-twl4030.c
+++ b/drivers/rtc/rtc-twl4030.c
@@ -1,14 +1,14 @@
 /*
  * drivers/rtc/rtc-twl4030.c
- * 
+ *
  * TWL4030 Real Time Clock interface
- * 
+ *
  * Copyright (C) 2007 MontaVista Software, Inc
  * Author: Alexandre Rusev <source@mvista.com>
  *
  * Based on original TI driver twl4030-rtc.c
  *   Copyright (C) 2006 Texas Instruments, Inc.
- * 
+ *
  * Based on rtc-omap.c
  *   Copyright (C) 2003 MontaVista Software, Inc.
  *   Author: George G. Davis <gdavis@mvista.com> or <source@mvista.com>
@@ -19,7 +19,7 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
- * 
+ *
  */
 
 #include <linux/kernel.h>
@@ -36,12 +36,12 @@
 #include <linux/device.h>
 #include <linux/i2c/twl4030.h>
 #include <linux/i2c/twl4030-rtc.h>
+#include <linux/io.h>
+#include <linux/irq.h>
 
-#include <asm/io.h>
 #include <asm/mach/time.h>
 #include <asm/system.h>
 #include <asm/hardware.h>
-#include <asm/irq.h>
 
 #define ALL_TIME_REGS		6
 
@@ -51,10 +51,10 @@
  */
 static int epoch = 1900;	/* year corresponding to 0x00   */
 
-/* 
- * Supports 1 byte read from TWL4030 RTC register. 
+/*
+ * Supports 1 byte read from TWL4030 RTC register.
  */
-static int twl4030_rtc_read_u8(u8 * data, u8 reg)
+static int twl4030_rtc_read_u8(u8 *data, u8 reg)
 {
 	int ret;
 
@@ -66,7 +66,7 @@ static int twl4030_rtc_read_u8(u8 * data, u8 reg)
 	return ret;
 }
 
-/* 
+/*
  * Supports 1 byte write to TWL4030 RTC registers.
  */
 static int twl4030_rtc_write_u8(u8 data, u8 reg)
@@ -75,13 +75,13 @@ static int twl4030_rtc_write_u8(u8 data, u8 reg)
 
 	ret = twl4030_i2c_write_u8(TWL4030_MODULE_RTC, data, reg);
 	if (ret < 0) {
-		printk(KERN_WARNING "twl4030_rtc: Could not write TWL4030" 
+		printk(KERN_WARNING "twl4030_rtc: Could not write TWL4030"
 		       "register %X - returned %d[%x]\n", reg, ret, ret);
 	}
 	return ret;
 }
 
-/* 
+/*
  * Enables timer or alarm interrupts.
  */
 static int set_rtc_irq_bit(unsigned char bit)
@@ -101,7 +101,7 @@ set_irq_out:
 }
 
 #ifdef CONFIG_PM
-/* 
+/*
  * Read timer or alarm interrupts register.
  */
 static int get_rtc_irq_bit(unsigned char *val)
@@ -112,7 +112,7 @@ static int get_rtc_irq_bit(unsigned char *val)
 	return ret;
 }
 #endif
-/* 
+/*
  * Disables timer or alarm interrupts.
  */
 static int mask_rtc_irq_bit(unsigned char bit)
@@ -123,7 +123,7 @@ static int mask_rtc_irq_bit(unsigned char bit)
 	ret = twl4030_rtc_read_u8(&val, REG_RTC_INTERRUPTS_REG);
 	if (ret < 0)
 		goto mask_irq_out;
-	
+
 	val &= ~bit;
 	ret = twl4030_rtc_write_u8(val, REG_RTC_INTERRUPTS_REG);
 
@@ -136,15 +136,15 @@ static int twl4030_rtc_alarm_irq_set_state(struct device *dev, int enabled)
 	int ret;
 
 	/* Allow ints for RTC ALARM updates.  */
-	if (enabled) 
+	if (enabled)
 		ret = set_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
-	else 
+	else
 		ret = mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
 
 	return ret;
 }
 
-/* 
+/*
  * Gets current TWL4030 RTC time and date parameters.
  */
 static int get_rtc_time(struct rtc_time *rtc_tm)
@@ -155,7 +155,7 @@ static int get_rtc_time(struct rtc_time *rtc_tm)
 
 	ret = twl4030_rtc_read_u8(&save_control, REG_RTC_CTRL_REG);
 	if (ret < 0)
-    		return ret;
+		return ret;
 
 	save_control |= BIT_RTC_CTRL_REG_GET_TIME_M;
 
@@ -182,7 +182,8 @@ static int get_rtc_time(struct rtc_time *rtc_tm)
 	 * Account for differences between how the RTC uses the values
 	 * and how they are defined in a struct rtc_time;
 	 */
-	if ((rtc_tm->tm_year += (epoch - 1900)) <= 69)
+	rtc_tm->tm_year += (epoch - 1900);
+	if (rtc_tm->tm_year <= 69)
 		rtc_tm->tm_year += 100;
 
 	rtc_tm->tm_mon--;
@@ -218,7 +219,7 @@ static int twl4030_rtc_set_time(struct device *dev, struct rtc_time *tm)
 
 	/* update all the alarm registers in one shot */
 	ret = twl4030_i2c_write(TWL4030_MODULE_RTC, rtc_data,
-			        REG_SECONDS_REG, ALL_TIME_REGS);
+			REG_SECONDS_REG, ALL_TIME_REGS);
 	if (ret < 0) {
 		printk(KERN_ERR "twl4030: twl4030_i2c_write error.\n");
 		goto out;
@@ -232,7 +233,7 @@ out:
 	return ret;
 }
 
-/* 
+/*
  * Gets current TWL4030 RTC alarm time.
  */
 static int get_rtc_alm_time(struct rtc_time *alm_tm)
@@ -258,7 +259,8 @@ static int get_rtc_alm_time(struct rtc_time *alm_tm)
 	 * Account for differences between how the RTC uses the values
 	 * and how they are defined in a struct rtc_time;
 	 */
-	if ((alm_tm->tm_year += (epoch - 1900)) <= 69)
+	alm_tm->tm_year += (epoch - 1900);
+	if (alm_tm->tm_year <= 69)
 		alm_tm->tm_year += 100;
 
 	alm_tm->tm_mon--;
@@ -276,7 +278,7 @@ static int twl4030_rtc_read_time(struct device *dev, struct rtc_time *tm)
 	return ret;
 }
 
-/* 
+/*
  * Gets current TWL4030 RTC alarm time.
  */
 static int twl4030_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
@@ -317,11 +319,11 @@ static int twl4030_rtc_irq_set_state(struct device *dev, int enabled)
 	int ret;
 
 	/* Allow ints for RTC updates.  */
-	if (enabled) 
+	if (enabled)
 		ret = set_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
-	else 
+	else
 		ret = mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
-	
+
 	return ret;
 }
 
@@ -342,7 +344,7 @@ static int twl4030_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 
 	/* update all the alarm registers in one shot */
 	ret = twl4030_i2c_write(TWL4030_MODULE_RTC, alarm_data,
-			        REG_ALARM_SECONDS_REG, ALL_TIME_REGS);
+			REG_ALARM_SECONDS_REG, ALL_TIME_REGS);
 	if (ret) {
 		printk(KERN_ERR "twl4030: twl4030_i2c_write error.\n");
 		goto out;
@@ -398,7 +400,7 @@ static int twl4030_rtc_ioctl(struct device *dev, unsigned int cmd,
 
 	case RTC_EPOCH_READ:
 		return put_user(epoch, (unsigned long *)arg);
-	case RTC_EPOCH_SET:	
+	case RTC_EPOCH_SET:
 		/*
 		 * There were no RTC clocks before 1900.
 		 */
@@ -425,7 +427,7 @@ static irqreturn_t twl4030_rtc_interrupt(int irq, void *rtc)
 	int ret = IRQ_NONE;
 	int res;
 	u8 rd_reg;
-	
+
 	res = twl4030_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
 	if (res)
 		goto out;
@@ -445,12 +447,13 @@ static irqreturn_t twl4030_rtc_interrupt(int irq, void *rtc)
 	if (res)
 		goto out;
 	/*
-	 * Workaround for strange behaviour with T2. Need to write into ISR 
+	 * Workaround for strange behaviour with T2. Need to write into ISR
 	 * register one more time to clear the interrupt. Otherwise, the same
 	 * RTC event generates 2 interrupts in a row.
 	 * (no errata document available)
 	 */
-	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, PWR_RTC_INT_CLR, REG_PWR_ISR1);
+	res = twl4030_i2c_write_u8(TWL4030_MODULE_INT,
+			PWR_RTC_INT_CLR, REG_PWR_ISR1);
 	if (res)
 		goto out;
 
@@ -477,7 +480,7 @@ static int __devinit twl4030_rtc_probe(struct platform_device *pdev)
 	struct rtc_device *rtc;
 	int ret = 0;
 	u8 rd_reg;
-	
+
 	if (pdata != NULL && pdata->init != NULL) {
 		ret = pdata->init();
 		if (ret < 0)
@@ -520,7 +523,7 @@ static int __devinit twl4030_rtc_probe(struct platform_device *pdev)
 	if (ret < 0) {
 		dev_err(&pdev->dev, "IRQ is not free.\n");
 		goto out1;
-	} 
+	}
 
 	/* Check RTC module status, Enable if it is off */
 	ret = twl4030_rtc_read_u8(&rd_reg, REG_RTC_CTRL_REG);
@@ -550,7 +553,7 @@ static int __devinit twl4030_rtc_probe(struct platform_device *pdev)
 		goto out2;
 
 	/* Rising edge detection enabled, needed for RTC alarm */
-	rd_reg |= 0x80;		
+	rd_reg |= 0x80;
 	ret = twl4030_i2c_write_u8(TWL4030_MODULE_INT, rd_reg, REG_PWR_EDR1);
 	if (ret < 0)
 		goto out2;
@@ -584,7 +587,7 @@ static int __devexit twl4030_rtc_remove(struct platform_device *pdev)
 
 	free_irq(TWL4030_MODIRQ_PWR, rtc);
 
-	if (pdata != NULL && pdata->exit != NULL) 
+	if (pdata != NULL && pdata->exit != NULL)
 		pdata->exit();
 
 	rtc_device_unregister(rtc);
@@ -600,7 +603,7 @@ static void twl4030_rtc_shutdown(struct platform_device *pdev)
 
 #ifdef CONFIG_PM
 
-static unsigned char irqstat = 0;
+static unsigned char irqstat;
 
 static int twl4030_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-- 
1.5.5.23.g2a5fe

[PATCH 07/23] USB: MUSB: checkpatch.pl fixes to cppi_dma.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/cppi_dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index 71c42db..e6770d6 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -359,7 +359,7 @@ cppi_dump_rx(int level, struct cppi_channel *c, const char *tag)
 			"\n",
 		c->index, tag,
 		musb_readl(c->controller->tibase,
-			DAVINCI_RXCPPI_BUFCNT0_REG + 4 *c->index),
+			DAVINCI_RXCPPI_BUFCNT0_REG + 4 * c->index),
 		musb_readw(c->hw_ep->regs, MUSB_RXCSR),
 
 		musb_readl(&rx->rx_skipbytes, 0),
-- 
1.5.5.23.g2a5fe

[PATCH 08/23] USB: MUSB: checkpatch.pl fixes to davinci.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/davinci.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 3477800..acd2aa8 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -29,8 +29,8 @@
 #include <linux/list.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/memory.h>
 #include <asm/arch/gpio.h>
@@ -38,7 +38,6 @@
 
 #include "musb_core.h"
 
-
 #ifdef CONFIG_MACH_DAVINCI_EVM
 #include <asm/arch/i2c-client.h>
 #endif
@@ -93,7 +92,7 @@ void musb_platform_enable(struct musb *musb)
 
 	if (is_dma_capable() && !dma_off)
 		printk(KERN_WARNING "%s %s: dma not reactivated\n",
-				__FILE__, __FUNCTION__);
+				__FILE__, __func__);
 	else
 		dma_off = 0;
 
@@ -446,7 +445,8 @@ int musb_platform_exit(struct musb *musb)
 				break;
 			if ((devctl & MUSB_DEVCTL_VBUS) != warn) {
 				warn = devctl & MUSB_DEVCTL_VBUS;
-				DBG(1, "VBUS %d\n", warn >> MUSB_DEVCTL_VBUS_SHIFT);
+				DBG(1, "VBUS %d\n",
+					warn >> MUSB_DEVCTL_VBUS_SHIFT);
 			}
 			msleep(1000);
 			maxdelay--;
-- 
1.5.5.23.g2a5fe

[PATCH 09/23] USB: MUSB: checkpatch.pl fixed to musb_core.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_core.c |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index fb37e2c..c5816a2 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -97,8 +97,7 @@
 #include <linux/list.h>
 #include <linux/kobject.h>
 #include <linux/platform_device.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 #ifdef	CONFIG_ARM
 #include <asm/arch/hardware.h>
@@ -180,7 +179,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
 				index += len & ~0x03;
 			}
 			if (len & 0x02) {
-				musb_writew(fifo, 0, *(u16*)&src[index]);
+				musb_writew(fifo, 0, *(u16 *)&src[index]);
 				index += 2;
 			}
 		} else {
@@ -218,7 +217,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
 				index = len & ~0x03;
 			}
 			if (len & 0x02) {
-				*(u16*)&dst[index] = musb_readw(fifo, 0);
+				*(u16 *)&dst[index] = musb_readw(fifo, 0);
 				index += 2;
 			}
 		} else {
@@ -388,9 +387,9 @@ void musb_hnp_stop(struct musb *musb)
 
 #define STAGE0_MASK (MUSB_INTR_RESUME | MUSB_INTR_SESSREQ \
 		| MUSB_INTR_VBUSERROR | MUSB_INTR_CONNECT \
-		| MUSB_INTR_RESET )
+		| MUSB_INTR_RESET)
 
-static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
+static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 				u8 devctl, u8 power)
 {
 	irqreturn_t handled = IRQ_NONE;
@@ -710,7 +709,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
  * @param devctl
  * @param power
  */
-static irqreturn_t musb_stage2_irq(struct musb * musb, u8 int_usb,
+static irqreturn_t musb_stage2_irq(struct musb *musb, u8 int_usb,
 				u8 devctl, u8 power)
 {
 	irqreturn_t handled = IRQ_NONE;
@@ -1221,13 +1220,13 @@ static int __init ep_config_from_table(struct musb *musb)
 		u8	epn = cfg->hw_ep_num;
 
 		if (epn >= MUSB_C_NUM_EPS) {
-			pr_debug( "%s: invalid ep %d\n",
+			pr_debug("%s: invalid ep %d\n",
 					musb_driver_name, epn);
 			continue;
 		}
 		offset = fifo_setup(musb, hw_ep + epn, cfg++, offset);
 		if (offset < 0) {
-			pr_debug( "%s: mem overrun, ep %d\n",
+			pr_debug("%s: mem overrun, ep %d\n",
 					musb_driver_name, epn);
 			return -EINVAL;
 		}
@@ -1242,7 +1241,7 @@ static int __init ep_config_from_table(struct musb *musb)
 
 #ifdef CONFIG_USB_MUSB_HDRC_HCD
 	if (!musb->bulk_ep) {
-		pr_debug( "%s: missing bulk\n", musb_driver_name);
+		pr_debug("%s: missing bulk\n", musb_driver_name);
 		return -EINVAL;
 	}
 #endif
@@ -1309,7 +1308,7 @@ static int __init ep_config_from_hw(struct musb *musb)
 
 #ifdef CONFIG_USB_MUSB_HDRC_HCD
 	if (!musb->bulk_ep) {
-		pr_debug( "%s: missing bulk\n", musb_driver_name);
+		pr_debug("%s: missing bulk\n", musb_driver_name);
 		return -EINVAL;
 	}
 #endif
@@ -1340,9 +1339,8 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
 	reg = musb_readb(mbase, 0x10 + MUSB_CONFIGDATA);
 
 	strcpy(aInfo, (reg & MUSB_CONFIGDATA_UTMIDW) ? "UTMI-16" : "UTMI-8");
-	if (reg & MUSB_CONFIGDATA_DYNFIFO) {
+	if (reg & MUSB_CONFIGDATA_DYNFIFO)
 		strcat(aInfo, ", dyn FIFOs");
-	}
 	if (reg & MUSB_CONFIGDATA_MPRXE) {
 		strcat(aInfo, ", bulk combine");
 #ifdef C_MP_RX
@@ -1367,9 +1365,8 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
 		strcat(aInfo, ", HB-ISO Tx");
 		strcat(aInfo, " (X)");		/* no driver support */
 	}
-	if (reg & MUSB_CONFIGDATA_SOFTCONE) {
+	if (reg & MUSB_CONFIGDATA_SOFTCONE)
 		strcat(aInfo, ", SoftConn");
-	}
 
 	printk(KERN_DEBUG "%s: ConfigData=0x%02x (%s)\n",
 			musb_driver_name, reg, aInfo);
@@ -1748,12 +1745,12 @@ static ssize_t
 musb_srp_store(struct device *dev, struct device_attribute *attr,
 		const char *buf, size_t n)
 {
-	struct musb	*musb=dev_to_musb(dev);
+	struct musb	*musb = dev_to_musb(dev);
 	unsigned short	srp;
 
 	if (sscanf(buf, "%hu", &srp) != 1
 			|| (srp != 1)) {
-		printk (KERN_ERR "SRP: Value must be 1\n");
+		printk(KERN_ERR "SRP: Value must be 1\n");
 		return -EINVAL;
 	}
 
@@ -1921,7 +1918,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 #ifdef CONFIG_USB_MUSB_OTG
 		break;
 #else
-	bad_config:
+bad_config:
 #endif
 	default:
 		dev_err(dev, "incompatible Kconfig role setting\n");
@@ -1997,7 +1994,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 	INIT_WORK(&musb->irq_work, musb_irq_work);
 
 	/* attach to the IRQ */
-	if (request_irq (nIrq, musb->isr, 0, dev->bus_id, musb)) {
+	if (request_irq(nIrq, musb->isr, 0, dev->bus_id, musb)) {
 		dev_err(dev, "request_irq %d failed!\n", nIrq);
 		status = -ENODEV;
 		goto fail2;
-- 
1.5.5.23.g2a5fe

[PATCH 10/23] USB: MUSB: checkpatch.pl fixes to musb_gadget.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_gadget.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 0fb9635..303b6f6 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -321,8 +321,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
 					csr |= (MUSB_TXCSR_DMAENAB |
 							MUSB_TXCSR_MODE);
 					/* against programming guide */
-				}
-				else
+				} else
 					csr |= (MUSB_TXCSR_AUTOSET
 							| MUSB_TXCSR_DMAENAB
 							| MUSB_TXCSR_DMAMODE
@@ -812,7 +811,7 @@ void musb_g_rx(struct musb *musb, u8 epnum)
 		}
 
 		/* incomplete, and not short? wait for next IN packet */
-                if ((request->actual < request->length)
+		if ((request->actual < request->length)
 				&& (musb_ep->dma->actual_len
 					== musb_ep->packet_sz))
 			goto done;
@@ -1482,7 +1481,7 @@ static void musb_pullup(struct musb *musb, int is_on)
 #if 0
 static int musb_gadget_vbus_session(struct usb_gadget *gadget, int is_active)
 {
-	DBG(2, "<= %s =>\n", __FUNCTION__);
+	DBG(2, "<= %s =>\n", __func__);
 
 	/*
 	 * FIXME iff driver's softconnect flag is set (as it is during probe,
@@ -1543,7 +1542,7 @@ static struct musb *the_gadget;
 static void musb_gadget_release(struct device *dev)
 {
 	/* kref_put(WHAT) */
-	dev_dbg(dev, "%s\n", __FUNCTION__);
+	dev_dbg(dev, "%s\n", __func__);
 }
 
 
@@ -1689,7 +1688,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 	/* driver must be initialized to support peripheral mode */
 	if (!musb || !(musb->board_mode == MUSB_OTG
 				|| musb->board_mode != MUSB_OTG)) {
-		DBG(1,"%s, no dev??\n", __FUNCTION__);
+		DBG(1, "%s, no dev??\n", __func__);
 		return -ENODEV;
 	}
 
@@ -1803,7 +1802,7 @@ static void stop_activity(struct musb *musb, struct usb_gadget_driver *driver)
 		}
 
 		spin_unlock(&musb->lock);
-		driver->disconnect (&musb->g);
+		driver->disconnect(&musb->g);
 		spin_lock(&musb->lock);
 	}
 }
-- 
1.5.5.23.g2a5fe

[PATCH 11/23] USB: MUSB: checkpatch.pl fixed to musb_gadget_ep0.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_gadget_ep0.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 3529359..b50a30d 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -57,7 +57,7 @@
 
 static char *decode_ep0stage(u8 stage)
 {
-	switch(stage) {
+	switch (stage) {
 	case MUSB_EP0_STAGE_SETUP:	return "idle";
 	case MUSB_EP0_STAGE_TX:		return "in";
 	case MUSB_EP0_STAGE_RX:		return "out";
-- 
1.5.5.23.g2a5fe

[PATCH 12/23] USB: MUSB: checkpatch.pl fixed to musb_host.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_host.c |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 82e1265..f9e98d0 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -103,7 +103,7 @@
 
 static void musb_ep_program(struct musb *musb, u8 epnum,
 			struct urb *urb, unsigned int nOut,
-			u8 * buf, u32 len);
+			u8 *buf, u32 len);
 
 /*
  * Clear TX fifo. Needed to avoid BABBLE errors.
@@ -210,7 +210,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
 			case USB_ENDPOINT_XFER_BULK:	s = "-bulk"; break;
 			case USB_ENDPOINT_XFER_ISOC:	s = "-iso"; break;
 			default:			s = "-intr"; break;
-			}; s;}),
+			}; s; }),
 			epnum, buf, len);
 
 	/* Configure endpoint */
@@ -244,7 +244,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
 		} else {
 			qh->frame = urb->start_frame;
 			/* enable SOF interrupt so we can count down */
-DBG(1,"SOF for %d\n", epnum);
+			DBG(1, "SOF for %d\n", epnum);
 #if 1 /* ifndef	CONFIG_ARCH_DAVINCI */
 			musb_writeb(mbase, MUSB_INTRUSBE, 0xff);
 #endif
@@ -439,10 +439,9 @@ static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)
 	 * leave toggle alone (may not have been saved yet)
 	 */
 	csr |= MUSB_RXCSR_FLUSHFIFO | MUSB_RXCSR_RXPKTRDY;
-	csr &= ~( MUSB_RXCSR_H_REQPKT
+	csr &= ~(MUSB_RXCSR_H_REQPKT
 		| MUSB_RXCSR_H_AUTOREQ
-		| MUSB_RXCSR_AUTOCLEAR
-		);
+		| MUSB_RXCSR_AUTOCLEAR);
 
 	/* write 2x to allow double buffering */
 	musb_writew(hw_ep->regs, MUSB_RXCSR, csr);
@@ -614,7 +613,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)
  */
 static void musb_ep_program(struct musb *musb, u8 epnum,
 			struct urb *urb, unsigned int is_out,
-			u8 * buf, u32 len)
+			u8 *buf, u32 len)
 {
 	struct dma_controller	*dma_controller;
 	struct dma_channel	*dma_channel;
@@ -754,7 +753,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
 			csr &= ~(MUSB_TXCSR_AUTOSET
 				| MUSB_TXCSR_DMAMODE
 				| MUSB_TXCSR_DMAENAB);
-                        csr |= MUSB_TXCSR_MODE;
+			csr |= MUSB_TXCSR_MODE;
 			musb_writew(epio, MUSB_TXCSR,
 				csr | MUSB_TXCSR_MODE);
 
@@ -1270,8 +1269,8 @@ void musb_host_tx(struct musb *musb, u8 epnum)
 			if (qh->segsize < qh->maxpacket)
 				done = true;
 			else if (qh->offset == urb->transfer_buffer_length
-					&& !(urb-> transfer_flags
-							& URB_ZERO_PACKET))
+					&& !(urb->transfer_flags
+						& URB_ZERO_PACKET))
 				done = true;
 			if (!done) {
 				buf = urb->transfer_buffer
@@ -1945,13 +1944,12 @@ static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh, int is_in)
 	} else {
 		musb_h_tx_flush_fifo(ep);
 		csr = musb_readw(epio, MUSB_TXCSR);
-		csr &= ~( MUSB_TXCSR_AUTOSET
+		csr &= ~(MUSB_TXCSR_AUTOSET
 			| MUSB_TXCSR_DMAENAB
 			| MUSB_TXCSR_H_RXSTALL
 			| MUSB_TXCSR_H_NAKTIMEOUT
 			| MUSB_TXCSR_H_ERROR
-			| MUSB_TXCSR_TXPKTRDY
-			);
+			| MUSB_TXCSR_TXPKTRDY);
 		musb_writew(epio, MUSB_TXCSR, csr);
 		/* REVISIT may need to clear FLUSHFIFO ... */
 		musb_writew(epio, MUSB_TXCSR, csr);
@@ -2139,7 +2137,7 @@ static int musb_bus_resume(struct usb_hcd *hcd)
 const struct hc_driver musb_hc_driver = {
 	.description		= "musb-hcd",
 	.product_desc		= "MUSB HDRC host driver",
-	.hcd_priv_size		= sizeof (struct musb),
+	.hcd_priv_size		= sizeof(struct musb),
 	.flags			= HCD_USB2 | HCD_MEMORY,
 
 	/* not using irq handler or reset hooks from usbcore, since
-- 
1.5.5.23.g2a5fe

[PATCH 13/23] USB: MUSB: checkpatch.pl fixed to musb_procfs.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_procfs.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/musb/musb_procfs.c b/drivers/usb/musb/musb_procfs.c
index bd282da..e6e050c 100644
--- a/drivers/usb/musb/musb_procfs.c
+++ b/drivers/usb/musb/musb_procfs.c
@@ -35,7 +35,7 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <asm/uaccess.h>	/* FIXME remove procfs writes */
+#include <linux/uaccess.h>	/* FIXME remove procfs writes */
 #include <asm/arch/hardware.h>
 
 #include "musb_core.h"
@@ -189,7 +189,7 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
 			max -= code;
 			break;
 		}
-		list_for_each_entry (req, &ep->req_list, list) {
+		list_for_each_entry(req, &ep->req_list, list) {
 			code = snprintf(buf, max, "\treq %p, %s%s%d/%d\n",
 					req,
 					req->zero ? "zero, " : "",
@@ -201,7 +201,7 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
 			buf += code;
 			max -= code;
 		}
-	} while(0);
+	} while (0);
 	return buf - buffer;
 }
 #endif
@@ -700,7 +700,7 @@ static int musb_proc_write(struct file *file, const char __user *buffer,
 		}
 		break;
 
-#if (MUSB_DEBUG>0)
+#if (MUSB_DEBUG > 0)
 		/* set/read debug level */
 	case 'D':{
 			if (count > 1) {
-- 
1.5.5.23.g2a5fe

[PATCH 14/23] USB: MUSB: checkpatch.pl fixes to musb_virthub.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_virthub.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 10b9089..e0e9ce5 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -299,7 +299,7 @@ int musb_hub_control(
 		break;
 	case GetHubStatus:
 		temp = 0;
-		*(__le32 *) buf = cpu_to_le32 (temp);
+		*(__le32 *) buf = cpu_to_le32(temp);
 		break;
 	case GetPortStatus:
 		if (wIndex != 1)
@@ -340,7 +340,7 @@ int musb_hub_control(
 				(__le32 *) buf);
 
 		/* port change status is more interesting */
-		DBG(get_unaligned((u16*)(buf+2)) ? 2 : 5, "port status %08x\n",
+		DBG(get_unaligned((u16 *)(buf+2)) ? 2 : 5, "port status %08x\n",
 				musb->port1_status);
 		break;
 	case SetPortFeature:
-- 
1.5.5.23.g2a5fe

[PATCH 15/23] USB: MUSB: checkpatch.pl fixes to musbhsdma.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musbhsdma.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 97fd146..f0ac65d 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -216,7 +216,7 @@ static void configure_channel(struct dma_channel *pChannel,
 		csr);
 }
 
-static int dma_channel_program(struct dma_channel * pChannel,
+static int dma_channel_program(struct dma_channel *pChannel,
 				u16 packet_sz, u8 mode,
 				dma_addr_t dma_addr, u32 len)
 {
@@ -257,22 +257,21 @@ static int dma_channel_abort(struct dma_channel *pChannel)
 		if (pImplChannel->transmit) {
 
 			csr = musb_readw(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR));
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR));
 			csr &= ~(MUSB_TXCSR_AUTOSET |
 				 MUSB_TXCSR_DMAENAB |
 				 MUSB_TXCSR_DMAMODE);
 			musb_writew(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR),
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR),
 				csr);
-		}
-		else {
+		} else {
 			csr = musb_readw(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR));
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR));
 			csr &= ~(MUSB_RXCSR_AUTOCLEAR |
 				 MUSB_RXCSR_DMAENAB |
 				 MUSB_RXCSR_DMAMODE);
 			musb_writew(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR),
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR),
 				csr);
 		}
 
@@ -402,8 +401,8 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
 		return NULL;
 	}
 
-	if (!(controller = kzalloc(sizeof(struct musb_dma_controller),
-				GFP_KERNEL)))
+	controller = kzalloc(sizeof(struct musb_dma_controller), GPF_KERNEL);
+	if (!controller)
 		return NULL;
 
 	controller->bChannelCount = MUSB_HSDMA_CHANNELS;
-- 
1.5.5.23.g2a5fe

[PATCH 16/23] USB: MUSB: checkpatch.pl fixes to omap2430.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/omap2430.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index c21d93a..e092393 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -32,8 +32,8 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/mux.h>
-- 
1.5.5.23.g2a5fe

[PATCH 17/23] USB: MUSB: checkpatch.pl fixes to tusb6010.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/tusb6010.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 3008b6d..bed2e18 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -79,7 +79,7 @@ static int __init tusb_print_revision(struct musb *musb)
 	return tusb_get_revision(musb);
 }
 
-#define WBUS_QUIRK_MASK	(TUSB_PHY_OTG_CTRL_TESTM2 | TUSB_PHY_OTG_CTRL_TESTM1	\
+#define WBUS_QUIRK_MASK	(TUSB_PHY_OTG_CTRL_TESTM2 | TUSB_PHY_OTG_CTRL_TESTM1 \
 				| TUSB_PHY_OTG_CTRL_TESTM0)
 
 /*
@@ -89,7 +89,7 @@ static int __init tusb_print_revision(struct musb *musb)
 static void tusb_wbus_quirk(struct musb *musb, int enabled)
 {
 	void __iomem	*tbase = musb->ctrl_base;
-	static u32	phy_otg_ctrl = 0, phy_otg_ena = 0;
+	static u32	phy_otg_ctrl, phy_otg_ena;
 	u32		tmp;
 
 	if (enabled) {
@@ -477,7 +477,7 @@ done:
 void musb_platform_try_idle(struct musb *musb, unsigned long timeout)
 {
 	unsigned long		default_timeout = jiffies + msecs_to_jiffies(3);
-	static unsigned long	last_timer = 0;
+	static unsigned long	last_timer;
 
 	if (timeout == 0)
 		timeout = default_timeout;
@@ -920,7 +920,7 @@ static int dma_off;
  * REVISIT:
  * - Check what is unnecessary in MGC_HdrcStart()
  */
-void musb_platform_enable(struct musb * musb)
+void musb_platform_enable(struct musb *musb)
 {
 	void __iomem	*tbase = musb->ctrl_base;
 
@@ -956,7 +956,7 @@ void musb_platform_enable(struct musb * musb)
 
 	if (is_dma_capable() && dma_off)
 		printk(KERN_WARNING "%s %s: dma not reactivated\n",
-				__FILE__, __FUNCTION__);
+				__FILE__, __func__);
 	else
 		dma_off = 1;
 }
@@ -980,7 +980,7 @@ void musb_platform_disable(struct musb *musb)
 
 	if (is_dma_capable() && !dma_off) {
 		printk(KERN_WARNING "%s %s: dma still active\n",
-				__FILE__, __FUNCTION__);
+				__FILE__, __func__);
 		dma_off = 1;
 	}
 }
-- 
1.5.5.23.g2a5fe

[PATCH 18/23] USB: MUSB: checkpatch.pl fixes to tusb6010_omap.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/tusb6010_omap.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 618b1e8..66e146e 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -302,9 +302,9 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
 	channel->status = MUSB_DMA_STATUS_BUSY;
 
 	/* Since we're recycling dma areas, we need to clean or invalidate */
-	if (chdat->tx) {
+	if (chdat->tx)
 		dma_cache_maint(phys_to_virt(dma_addr), len, DMA_TO_DEVICE);
-	} else
+	else
 		dma_cache_maint(phys_to_virt(dma_addr), len, DMA_FROM_DEVICE);
 
 	/* Use 16-bit transfer if dma_addr is not 32-bit aligned */
@@ -336,7 +336,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
 		dma_params.dst_amode	= OMAP_DMA_AMODE_DOUBLE_IDX;
 		dma_params.dst_start	= (unsigned long)fifo;
 		dma_params.dst_ei	= 1;
-		dma_params.dst_fi	= -31;		/* Loop 32 byte window */
+		dma_params.dst_fi	= -31;	/* Loop 32 byte window */
 
 		dma_params.trigger	= sync_dev;
 		dma_params.sync_mode	= OMAP_DMA_SYNC_FRAME;
@@ -348,7 +348,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
 		dma_params.src_amode	= OMAP_DMA_AMODE_DOUBLE_IDX;
 		dma_params.src_start	= (unsigned long)fifo;
 		dma_params.src_ei	= 1;
-		dma_params.src_fi	= -31;		/* Loop 32 byte window */
+		dma_params.src_fi	= -31;	/* Loop 32 byte window */
 
 		dma_params.dst_amode	= OMAP_DMA_AMODE_POST_INC;
 		dma_params.dst_start	= (unsigned long)dma_addr;
@@ -581,7 +581,7 @@ tusb_omap_dma_allocate(struct dma_controller *c,
 	DBG(3, "ep%i %s dma: %s dma%i dmareq%i sync%i\n",
 		chdat->epnum,
 		chdat->tx ? "tx" : "rx",
-		chdat->ch >=0 ? "dedicated" : "shared",
+		chdat->ch >= 0 ? "dedicated" : "shared",
 		chdat->ch >= 0 ? chdat->ch : tusb_dma->ch,
 		chdat->dmareq >= 0 ? chdat->dmareq : tusb_dma->dmareq,
 		chdat->sync_dev >= 0 ? chdat->sync_dev : tusb_dma->sync_dev);
@@ -643,8 +643,7 @@ void dma_controller_destroy(struct dma_controller *c)
 	for (i = 0; i < MAX_DMAREQ; i++) {
 		struct dma_channel *ch = dma_channel_pool[i];
 		if (ch) {
-			if (ch->private_data)
-				kfree(ch->private_data);
+			kfree(ch->private_data);
 			kfree(ch);
 		}
 	}
-- 
1.5.5.23.g2a5fe

[PATCH 19/23] USB: MUSB: checkpatch.pl fixes to davinci.h

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/davinci.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h
index dc37a19..7fb6238 100644
--- a/drivers/usb/musb/davinci.h
+++ b/drivers/usb/musb/davinci.h
@@ -67,9 +67,9 @@
 #define DAVINCI_CPPI_STATERAM_BASE_OFFSET   0x100
 
 #define DAVINCI_TXCPPI_STATERAM_OFFSET(chnum) \
-	(DAVINCI_CPPI_STATERAM_BASE_OFFSET +       ((chnum)* 0x40))
+	(DAVINCI_CPPI_STATERAM_BASE_OFFSET +       ((chnum) * 0x40))
 #define DAVINCI_RXCPPI_STATERAM_OFFSET(chnum) \
-	(DAVINCI_CPPI_STATERAM_BASE_OFFSET + 0x20 +((chnum)* 0x40))
+	(DAVINCI_CPPI_STATERAM_BASE_OFFSET + 0x20 + ((chnum) * 0x40))
 
 /* CPPI masks */
 #define DAVINCI_DMA_CTRL_ENABLE		1
-- 
1.5.5.23.g2a5fe

[PATCH 20/23] USB: MUSB: checkpatch.pl fixes to musb_core.h

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_core.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 3494b99..c2cd5a9 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -218,7 +218,7 @@ enum musb_g_ep0_state {
 
 /* "flat" mapping: each endpoint has its own i/o address */
 #elif	defined(MUSB_FLAT_REG)
-#define musb_ep_select(_mbase, _epnum)	(((void)(_mbase)),((void)(_epnum)))
+#define musb_ep_select(_mbase, _epnum)	(((void)(_mbase)), ((void)(_epnum)))
 #define	MUSB_EP_OFFSET			MUSB_FLAT_OFFSET
 
 /* "indexed" mapping: INDEX register controls register bank select */
@@ -402,7 +402,7 @@ struct musb {
 #define	can_bulk_split(musb,type) \
 		(((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split)
 #else
-#define	can_bulk_split(musb,type)	0
+#define	can_bulk_split(musb, type)	0
 #endif
 
 #ifdef C_MP_RX
@@ -410,7 +410,7 @@ struct musb {
 #define	can_bulk_combine(musb,type) \
 		(((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine)
 #else
-#define	can_bulk_combine(musb,type)	0
+#define	can_bulk_combine(musb, type)	0
 #endif
 
 #ifdef CONFIG_USB_GADGET_MUSB_HDRC
@@ -464,8 +464,8 @@ extern const char musb_driver_name[];
 extern void musb_start(struct musb *musb);
 extern void musb_stop(struct musb *musb);
 
-extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 * src);
-extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 * dst);
+extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src);
+extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 *dst);
 
 extern void musb_load_testpacket(struct musb *);
 
-- 
1.5.5.23.g2a5fe

[PATCH 21/23] USB: MUSB: checkpatch.pl fixes to musb_io.h

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_io.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 9d06ed7..6bbedae 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -35,7 +35,7 @@
 #ifndef __MUSB_LINUX_PLATFORM_ARCH_H__
 #define __MUSB_LINUX_PLATFORM_ARCH_H__
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 #ifndef	CONFIG_ARM
 static inline void readsl(const void __iomem *addr, void *buf, int len)
-- 
1.5.5.23.g2a5fe

[PATCH 22/23] USB: MUSB: checkpatch.pl fixed to musb_regs.h

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_regs.h |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index d1500a4..9c22866 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -204,10 +204,10 @@
 
 /* CSR0 bits to avoid zeroing (write zero clears, write 1 ignored) */
 #define MUSB_CSR0_P_WZC_BITS	\
-	( MUSB_CSR0_P_SENTSTALL )
+	(MUSB_CSR0_P_SENTSTALL)
 #define MUSB_CSR0_H_WZC_BITS	\
-	( MUSB_CSR0_H_NAKTIMEOUT | MUSB_CSR0_H_RXSTALL \
-	| MUSB_CSR0_RXPKTRDY )
+	(MUSB_CSR0_H_NAKTIMEOUT | MUSB_CSR0_H_RXSTALL \
+	| MUSB_CSR0_RXPKTRDY)
 
 /* TxType/RxType */
 #define MUSB_TYPE_SPEED		0xc0
@@ -253,11 +253,11 @@
 
 /* TXCSR bits to avoid zeroing (write zero clears, write 1 ignored) */
 #define MUSB_TXCSR_P_WZC_BITS	\
-	( MUSB_TXCSR_P_INCOMPTX | MUSB_TXCSR_P_SENTSTALL \
-	| MUSB_TXCSR_P_UNDERRUN | MUSB_TXCSR_FIFONOTEMPTY )
+	(MUSB_TXCSR_P_INCOMPTX | MUSB_TXCSR_P_SENTSTALL \
+	| MUSB_TXCSR_P_UNDERRUN | MUSB_TXCSR_FIFONOTEMPTY)
 #define MUSB_TXCSR_H_WZC_BITS	\
-	( MUSB_TXCSR_H_NAKTIMEOUT | MUSB_TXCSR_H_RXSTALL \
-	| MUSB_TXCSR_H_ERROR | MUSB_TXCSR_FIFONOTEMPTY )
+	(MUSB_TXCSR_H_NAKTIMEOUT | MUSB_TXCSR_H_RXSTALL \
+	| MUSB_TXCSR_H_ERROR | MUSB_TXCSR_FIFONOTEMPTY)
 
 /* RXCSR in Peripheral and Host mode */
 #define MUSB_RXCSR_AUTOCLEAR		0x8000
@@ -288,11 +288,11 @@
 
 /* RXCSR bits to avoid zeroing (write zero clears, write 1 ignored) */
 #define MUSB_RXCSR_P_WZC_BITS	\
-	( MUSB_RXCSR_P_SENTSTALL | MUSB_RXCSR_P_OVERRUN \
-	| MUSB_RXCSR_RXPKTRDY )
+	(MUSB_RXCSR_P_SENTSTALL | MUSB_RXCSR_P_OVERRUN \
+	| MUSB_RXCSR_RXPKTRDY)
 #define MUSB_RXCSR_H_WZC_BITS	\
-	( MUSB_RXCSR_H_RXSTALL | MUSB_RXCSR_H_ERROR \
-	| MUSB_RXCSR_DATAERROR | MUSB_RXCSR_RXPKTRDY )
+	(MUSB_RXCSR_H_RXSTALL | MUSB_RXCSR_H_ERROR \
+	| MUSB_RXCSR_DATAERROR | MUSB_RXCSR_RXPKTRDY)
 
 /* HUBADDR */
 #define MUSB_HUBADDR_MULTI_TT		0x80
-- 
1.5.5.23.g2a5fe

[PATCH 23/23] USB: MUSB: checkpatch.pl fixes to musb_debug.h

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musb_debug.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index a9a0055..0743972 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -37,15 +37,15 @@
 
 #define yprintk(facility, format, args...) \
 	do { printk(facility "%s %d: " format , \
-	__FUNCTION__, __LINE__ , ## args); } while (0)
-#define WARN(fmt, args...) yprintk(KERN_WARNING,fmt, ## args)
-#define INFO(fmt,args...) yprintk(KERN_INFO,fmt, ## args)
-#define ERR(fmt,args...) yprintk(KERN_ERR,fmt, ## args)
+	__func__, __LINE__ , ## args); } while (0)
+#define WARN(fmt, args...) yprintk(KERN_WARNING, fmt, ## args)
+#define INFO(fmt, args...) yprintk(KERN_INFO, fmt, ## args)
+#define ERR(fmt, args...) yprintk(KERN_ERR, fmt, ## args)
 
 #define xprintk(level, facility, format, args...) do { \
-	if ( _dbg_level(level) ) { \
+	if (_dbg_level(level)) { \
 		printk(facility "%s %d: " format , \
-				__FUNCTION__, __LINE__ , ## args); \
+				__func__, __LINE__ , ## args); \
 	} } while (0)
 
 #if MUSB_DEBUG > 0
@@ -59,7 +59,7 @@ static inline int _dbg_level(unsigned l)
 	return debug >= l;
 }
 
-#define DBG(level,fmt,args...) xprintk(level,KERN_DEBUG,fmt, ## args)
+#define DBG(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args)
 
 extern const char *otg_state_string(struct musb *);
 
-- 
1.5.5.23.g2a5fe

Re: [PATCH 15/23] USB: MUSB: checkpatch.pl fixes to musbhsdma.c

[Felipe Balbi]

On Fri, Apr 11, 2008 at 11:28:28AM +0300, Felipe Balbi wrote:
> Misc cleanup patch.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  drivers/usb/musb/musbhsdma.c |   17 ++++++++---------
>  1 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
> index 97fd146..f0ac65d 100644
> --- a/drivers/usb/musb/musbhsdma.c
> +++ b/drivers/usb/musb/musbhsdma.c
> @@ -216,7 +216,7 @@ static void configure_channel(struct dma_channel *pChannel,
>  		csr);
>  }
>  
> -static int dma_channel_program(struct dma_channel * pChannel,
> +static int dma_channel_program(struct dma_channel *pChannel,
>  				u16 packet_sz, u8 mode,
>  				dma_addr_t dma_addr, u32 len)
>  {
> @@ -257,22 +257,21 @@ static int dma_channel_abort(struct dma_channel *pChannel)
>  		if (pImplChannel->transmit) {
>  
>  			csr = musb_readw(mbase,
> -				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR));
> +				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR));
>  			csr &= ~(MUSB_TXCSR_AUTOSET |
>  				 MUSB_TXCSR_DMAENAB |
>  				 MUSB_TXCSR_DMAMODE);
>  			musb_writew(mbase,
> -				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR),
> +				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR),
>  				csr);
> -		}
> -		else {
> +		} else {
>  			csr = musb_readw(mbase,
> -				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR));
> +				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR));
>  			csr &= ~(MUSB_RXCSR_AUTOCLEAR |
>  				 MUSB_RXCSR_DMAENAB |
>  				 MUSB_RXCSR_DMAMODE);
>  			musb_writew(mbase,
> -				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR),
> +				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR),
>  				csr);
>  		}
>  
> @@ -402,8 +401,8 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
>  		return NULL;
>  	}
>  
> -	if (!(controller = kzalloc(sizeof(struct musb_dma_controller),
> -				GFP_KERNEL)))
> +	controller = kzalloc(sizeof(struct musb_dma_controller), GPF_KERNEL);

Ugh, typo here... resending patch

> +	if (!controller)
>  		return NULL;
>  
>  	controller->bChannelCount = MUSB_HSDMA_CHANNELS;
> -- 
> 1.5.5.23.g2a5fe

-- 
	- Balbi

[PATCH 15/23] USB: MUSB: checkpatch.pl fixes to musbhsdma.c

[Felipe Balbi]

Misc cleanup patch.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/musb/musbhsdma.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 97fd146..f0ac65d 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -216,7 +216,7 @@ static void configure_channel(struct dma_channel *pChannel,
 		csr);
 }
 
-static int dma_channel_program(struct dma_channel * pChannel,
+static int dma_channel_program(struct dma_channel *pChannel,
 				u16 packet_sz, u8 mode,
 				dma_addr_t dma_addr, u32 len)
 {
@@ -257,22 +257,21 @@ static int dma_channel_abort(struct dma_channel *pChannel)
 		if (pImplChannel->transmit) {
 
 			csr = musb_readw(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR));
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR));
 			csr &= ~(MUSB_TXCSR_AUTOSET |
 				 MUSB_TXCSR_DMAENAB |
 				 MUSB_TXCSR_DMAMODE);
 			musb_writew(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR),
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR),
 				csr);
-		}
-		else {
+		} else {
 			csr = musb_readw(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR));
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR));
 			csr &= ~(MUSB_RXCSR_AUTOCLEAR |
 				 MUSB_RXCSR_DMAENAB |
 				 MUSB_RXCSR_DMAMODE);
 			musb_writew(mbase,
-				MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR),
+				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR),
 				csr);
 		}
 
@@ -402,8 +401,8 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
 		return NULL;
 	}
 
-	if (!(controller = kzalloc(sizeof(struct musb_dma_controller),
-				GFP_KERNEL)))
+	controller = kzalloc(sizeof(struct musb_dma_controller), GFP_KERNEL);
+	if (!controller)
 		return NULL;
 
 	controller->bChannelCount = MUSB_HSDMA_CHANNELS;
-- 
1.5.5.23.g2a5fe

RE: [PATCH 01/23] I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c

[Gadiyar, Anand]

> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org 
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Felipe Balbi
> Sent: Friday, April 11, 2008 1:58 PM
> To: linux-omap@vger.kernel.org
> Cc: Felipe Balbi
> Subject: [PATCH 01/23] I2C: TWL4030: checkpatch.pl fixes for 
> twl4030-core.c
> 
> Misc cleanup patch.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  drivers/i2c/chips/twl4030-core.c |   61 
> +++++++++++++++++--------------------
>  1 files changed, 28 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/i2c/chips/twl4030-core.c 
> b/drivers/i2c/chips/twl4030-core.c
> index 49bd63a..953c247 100644
> --- a/drivers/i2c/chips/twl4030-core.c
> +++ b/drivers/i2c/chips/twl4030-core.c
> @@ -43,8 +43,8 @@
>  #include <linux/slab.h>
>  #include <linux/clk.h>
>  #include <linux/device.h>
> +#include <linux/irq.h>
>  
> -#include <asm/irq.h>
>  #include <asm/mach/irq.h>
>  
>  #include <asm/arch/gpio.h>
> @@ -256,7 +256,7 @@ static struct irq_chip twl4030_irq_chip = {
>   *
>   * @return result of operation - 0 is success
>   */
> -int twl4030_i2c_write(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
> +int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, u8 num_bytes)
>  {
>  	int ret;
>  	int sid;
> @@ -295,6 +295,7 @@ int twl4030_i2c_write(u8 mod_no, u8 * 
> value, u8 reg, u8 num_bytes)
>  		ret = 0;
>  	return ret;
>  }
> +EXPORT_SYMBOL(twl4030_i2c_write);
>  
>  /**
>   * @brief twl4030_i2c_read - Reads a n bit register in TWL4030
> @@ -306,7 +307,7 @@ int twl4030_i2c_write(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
>   *
>   * @return result of operation - num_bytes is success else failure.
>   */
> -int twl4030_i2c_read(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
> +int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, u8 num_bytes)
>  {
>  	int ret;
>  	u8 val;
> @@ -348,6 +349,7 @@ int twl4030_i2c_read(u8 mod_no, u8 * value, u8 reg, u8 num_bytes)
>  		ret = 0;
>  	return ret;
>  }
> +EXPORT_SYMBOL(twl4030_i2c_read);
>  
>  /**
>   * @brief twl4030_i2c_write_u8 - Writes a 8 bit register in TWL4030
> @@ -367,6 +369,7 @@ int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
>  	temp_buffer[1] = value;
>  	return twl4030_i2c_write(mod_no, temp_buffer, reg, 1);
>  }
> +EXPORT_SYMBOL(twl4030_i2c_write_u8);
>  
>  /**
>   * @brief twl4030_i2c_read_u8 - Reads a 8 bit register from TWL4030
> @@ -377,10 +380,11 @@ int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
>   *
>   * @return result of operation - 0 is success
>   */
> -int twl4030_i2c_read_u8(u8 mod_no, u8 * value, u8 reg)
> +int twl4030_i2c_read_u8(u8 mod_no, u8 *value, u8 reg)
>  {
>  	return twl4030_i2c_read(mod_no, value, reg, 1);
>  }
> +EXPORT_SYMBOL(twl4030_i2c_read_u8);
>  
>  /* Helper Functions */
>  
> @@ -431,7 +435,8 @@ static void do_twl4030_module_irq(unsigned int irq, irq_desc_t *desc)
>  
>  			if (retval != IRQ_HANDLED)
>  				printk(KERN_ERR "ISR for TWL4030 module"
> -					" irq %d can't handle 
> interrupt\n", irq);
> +					" irq %d can't handle 
> interrupt\n",
> +					irq);
>  
>  			/*
>  			 * Here is where we should call the unmask method, but
> @@ -475,7 +480,7 @@ static int twl4030_irq_thread(void *data)
>  			if (++i2c_errors >= max_i2c_errors) {
>  				printk(KERN_ERR "Maximum I2C 
> error count"
>  						" exceeded.  
> Terminating %s.\n",
> -						__FUNCTION__);
> +						__func__);
>  				break;
>  			}
>  			continue;
> @@ -542,8 +547,10 @@ static int twl4030_detect_client(struct i2c_adapter *adapter, unsigned char sid)
>  	}
>  
>  	/* Check basic functionality */
> -	if (!(err = i2c_check_functionality(adapter, 
> I2C_FUNC_SMBUS_WORD_DATA |
> -						
> I2C_FUNC_SMBUS_WRITE_BYTE))) {
> +	err = i2c_check_functionality(adapter,
> +			I2C_FUNC_SMBUS_WORD_DATA
> +			| I2C_FUNC_SMBUS_WRITE_BYTE);
> +	if (!err) {
>  		pr_err("SlaveID=%d functionality check failed\n", sid);
>  		return err;
>  	}
> @@ -565,7 +572,8 @@ static int twl4030_detect_client(struct 
> i2c_adapter *adapter, unsigned char sid)
>  	pr_info("TWL4030: TRY attach Slave %s on Adapter %s [%x]\n",
>  				twl->client_name, adapter->name, err);
>  
> -	if ((err = i2c_attach_client(&twl->client))) {
> +	err = i2c_attach_client(&twl->client);
> +	if (err) {
>  		pr_err("Couldn't attach Slave %s on Adapter"
>  		       "%s [%x]\n", twl->client_name, 
> adapter->name, err);
>  	} else {
> @@ -586,7 +594,8 @@ static int twl4030_attach_adapter(struct i2c_adapter *adapter)
>  	for (i = 0; i < TWL4030_NUM_SLAVES; i++) {
>  		/* Check if I need to hook on to this adapter or not */
>  		if (twl4030_modules[i].adapter_index == 
> twl_i2c_adapter) {
> -			if ((ret = twl4030_detect_client(adapter, i)))
> +			ret = twl4030_detect_client(adapter, i);
> +			if (ret)
>  				goto free_client;
>  		}
>  	}
> @@ -604,7 +613,7 @@ static int twl4030_attach_adapter(struct i2c_adapter *adapter)
>  	return 0;
>  
>  free_client:
> -	pr_err("TWL_CLIENT(Idx=%d] registration failed[0x%x]\n",i,ret);
> +	pr_err("TWL_CLIENT(Idx=%d] registration 
> failed[0x%x]\n", i, ret);
>  
>  	/* ignore current slave..it never got registered */
>  	i--;
> @@ -621,7 +630,8 @@ free_client: static int twl4030_detach_client(struct i2c_client *client)
>  {
>  	int err;
> -	if ((err = i2c_detach_client(client))) {
> +	err = i2c_detach_client(client);
> +	if (err) {
>  		pr_err("Client detach failed\n");
>  		return err;
>  	}
> @@ -637,7 +647,7 @@ struct task_struct *start_twl4030_irq_thread(int irq)
>  			     "twl4030 irq %d", irq);
>  	if (!thread)
>  		pr_err("%s: could not create twl4030 irq %d thread!\n",
> -		       __FUNCTION__, irq);
> +		       __func__, irq);
>  
>  	return thread;
>  }
> @@ -686,9 +696,9 @@ static int power_companion_init(void)
>  	clk_put(osc);
>  
>  	switch (rate) {
> -		case 19200000 : ctrl = HFCLK_FREQ_19p2_MHZ; break;
> -		case 26000000 : ctrl = HFCLK_FREQ_26_MHZ; break;
> -		case 38400000 : ctrl = HFCLK_FREQ_38p4_MHZ; break;
> +	case 19200000 : ctrl = HFCLK_FREQ_19p2_MHZ; break;
> +	case 26000000 : ctrl = HFCLK_FREQ_26_MHZ; break;
> +	case 38400000 : ctrl = HFCLK_FREQ_38p4_MHZ; break;
>  	}
>  
>  	ctrl |= HIGH_PERF_SQ;
> @@ -875,23 +885,13 @@ static void twl_init_irq(void)
>  	set_irq_chained_handler(TWL4030_IRQNUM, do_twl4030_irq);
>  
>  	res = power_companion_init();
> -	if (res < 0) {
> +	if (res < 0)
>  		pr_err("%s[%d][%d]\n", msg, res, __LINE__);
> -	}
>  }
>  
>  static int __init twl4030_init(void)
>  {
> -	int res;
> -
> -	if ((res = i2c_add_driver(&twl4030_driver))) {
> -		printk(KERN_ERR "TWL4030: Driver registration failed\n");
> -		return res;
> -	}
> -
> -	pr_info(KERN_INFO "TWL4030: Driver registration complete.\n");
> -
> -	return 0;
> +	return i2c_add_driver(&twl4030_driver);
>  }

You're losing the failure print here. Not sure if it matters, but I'm pointing it out anyway.

>  
>  static void __exit twl4030_exit(void)
> @@ -903,11 +903,6 @@ static void __exit twl4030_exit(void)
>  subsys_initcall(twl4030_init);
>  module_exit(twl4030_exit);
>  
> -EXPORT_SYMBOL(twl4030_i2c_write_u8);
> -EXPORT_SYMBOL(twl4030_i2c_read_u8);
> -EXPORT_SYMBOL(twl4030_i2c_read);
> -EXPORT_SYMBOL(twl4030_i2c_write);
> -
>  MODULE_AUTHOR("Texas Instruments, Inc.");
>  MODULE_DESCRIPTION("I2C Core interface for TWL4030");
>  MODULE_LICENSE("GPL");
> -- 
> 1.5.5.23.g2a5fe
> 
> --
> To unsubscribe from this list: send the line "unsubscribe 
> linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 01/23] I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c

[Felipe Balbi]

On Fri, Apr 11, 2008 at 02:23:05PM +0530, ext Gadiyar, Anand wrote:
> >  static int __init twl4030_init(void)
> >  {
> > -	int res;
> > -
> > -	if ((res = i2c_add_driver(&twl4030_driver))) {
> > -		printk(KERN_ERR "TWL4030: Driver registration failed\n");
> > -		return res;
> > -	}
> > -
> > -	pr_info(KERN_INFO "TWL4030: Driver registration complete.\n");
> > -
> > -	return 0;
> > +	return i2c_add_driver(&twl4030_driver);
> >  }
> 
> You're losing the failure print here. Not sure if it matters, but I'm pointing it out anyway.

i2c subsystem will print it out for usb. No need to leave it here :)

if you follow i2c_add_driver, you'll get to
drivers/i2c/i2c-core.c:i2c_register_driver()

int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
{

[...]

	mutex_lock(&core_lock);

	pr_debug("i2c-core: driver [%s] registered\n", driver->driver.name);

[...]

	return 0;
}

-- 
	- Balbi

Re: [PATCH 01/23] I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c

[David Brownell]

On Friday 11 April 2008, Gadiyar, Anand wrote:
> >  static int __init twl4030_init(void)
> >  {
> > -     int res;
> > -
> > -     if ((res = i2c_add_driver(&twl4030_driver))) {
> > -             printk(KERN_ERR "TWL4030: Driver registration failed\n");
> > -             return res;
> > -     }
> > -
> > -     pr_info(KERN_INFO "TWL4030: Driver registration complete.\n");
> > -
> > -     return 0;
> > +     return i2c_add_driver(&twl4030_driver);
> >  }
> 
> You're losing the failure print here. Not sure if it matters, but
> I'm pointing it out anyway. 

Doesn't matter; the standard policy is to have module init
just add the drivers and let the subsystems handle any
(unlikely) warning messages.

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 00/23] General checkpatch.pl cleanup for twl and musb drivers

[Gadiyar, Anand]

Nice job! :)

By the way, how did you manage to get a list of checkpatch ERRORS and WARNINGS on a set of files?
Did you do a compare with /dev/null or is there a better way?

Regards,
Anand

> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org 
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Felipe Balbi
> Sent: Friday, April 11, 2008 1:58 PM
> To: linux-omap@vger.kernel.org
> Cc: Felipe Balbi
> Subject: [PATCH 00/23] General checkpatch.pl cleanup for twl 
> and musb drivers
> 
> The following series gets rid of checkpatch.pl ERRORS and WARNINGS
> for both twl4030 and musb drivers. I left some WARNINGS in musb_core.c
> because fixing them would decrease the code readability. Line 
> was only one
> character over the 80 max so it didn't make sense to fix that.
> 
> Felipe Balbi (23):
>   I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c
>   I2C: TWL4030: checkpatch.pl fixes for twl4030-usb.c
>   I2C: TWL4030: checkpatch.pl fixes for twl4030-gpio.c
>   I2C: TWL4030: checkpatch.pl fixes to tlw4030.h
>   I2C: TLW4030: checkpatch.pl fixes to tlw4030-rtc.h
>   I2C: TWL4030: checkpatch.pl fixes to rtc-twl4030.c
>   USB: MUSB: checkpatch.pl fixes to cppi_dma.c
>   USB: MUSB: checkpatch.pl fixes to davinci.c
>   USB: MUSB: checkpatch.pl fixed to musb_core.c
>   USB: MUSB: checkpatch.pl fixes to musb_gadget.c
>   USB: MUSB: checkpatch.pl fixed to musb_gadget_ep0.c
>   USB: MUSB: checkpatch.pl fixed to musb_host.c
>   USB: MUSB: checkpatch.pl fixed to musb_procfs.c
>   USB: MUSB: checkpatch.pl fixes to musb_virthub.c
>   USB: MUSB: checkpatch.pl fixes to musbhsdma.c
>   USB: MUSB: checkpatch.pl fixes to omap2430.c
>   USB: MUSB: checkpatch.pl fixes to tusb6010.c
>   USB: MUSB: checkpatch.pl fixes to tusb6010_omap.c
>   USB: MUSB: checkpatch.pl fixes to davinci.h
>   USB: MUSB: checkpatch.pl fixes to musb_core.h
>   USB: MUSB: checkpatch.pl fixes to musb_io.h
>   USB: MUSB: checkpatch.pl fixed to musb_regs.h
>   USB: MUSB: checkpatch.pl fixes to musb_debug.h
> 
>  drivers/i2c/chips/twl4030-core.c   |   61 
> +++++++++++++---------------
>  drivers/i2c/chips/twl4030-gpio.c   |   37 ++++++++---------
>  drivers/i2c/chips/twl4030-usb.c    |    3 +-
>  drivers/rtc/rtc-twl4030.c          |   77 
> ++++++++++++++++++-----------------
>  drivers/usb/musb/cppi_dma.c        |    2 +-
>  drivers/usb/musb/davinci.c         |    8 ++--
>  drivers/usb/musb/davinci.h         |    4 +-
>  drivers/usb/musb/musb_core.c       |   35 +++++++---------
>  drivers/usb/musb/musb_core.h       |   10 ++--
>  drivers/usb/musb/musb_debug.h      |   14 +++---
>  drivers/usb/musb/musb_gadget.c     |   13 +++---
>  drivers/usb/musb/musb_gadget_ep0.c |    2 +-
>  drivers/usb/musb/musb_host.c       |   26 ++++++------
>  drivers/usb/musb/musb_io.h         |    2 +-
>  drivers/usb/musb/musb_procfs.c     |    8 ++--
>  drivers/usb/musb/musb_regs.h       |   22 +++++-----
>  drivers/usb/musb/musb_virthub.c    |    4 +-
>  drivers/usb/musb/musbhsdma.c       |   17 ++++----
>  drivers/usb/musb/omap2430.c        |    2 +-
>  drivers/usb/musb/tusb6010.c        |   12 +++---
>  drivers/usb/musb/tusb6010_omap.c   |   13 +++---
>  include/linux/i2c/twl4030-rtc.h    |    4 +-
>  include/linux/i2c/twl4030.h        |    6 +-
>  23 files changed, 186 insertions(+), 196 deletions(-)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe 
> linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 00/23] General checkpatch.pl cleanup for twl and musb drivers

[Felipe Balbi]

On Fri, Apr 11, 2008 at 02:36:05PM +0530, ext Gadiyar, Anand wrote:
> Nice job! :)
> 
> By the way, how did you manage to get a list of checkpatch ERRORS and WARNINGS on a set of files?
> Did you do a compare with /dev/null or is there a better way?

scripts/checkpatch.pl --file drivers/usb/musb/*.[ch] ;-)

> 
> Regards,
> Anand
> 
> > -----Original Message-----
> > From: linux-omap-owner@vger.kernel.org 
> > [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Felipe Balbi
> > Sent: Friday, April 11, 2008 1:58 PM
> > To: linux-omap@vger.kernel.org
> > Cc: Felipe Balbi
> > Subject: [PATCH 00/23] General checkpatch.pl cleanup for twl 
> > and musb drivers
> > 
> > The following series gets rid of checkpatch.pl ERRORS and WARNINGS
> > for both twl4030 and musb drivers. I left some WARNINGS in musb_core.c
> > because fixing them would decrease the code readability. Line 
> > was only one
> > character over the 80 max so it didn't make sense to fix that.
> > 
> > Felipe Balbi (23):
> >   I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c
> >   I2C: TWL4030: checkpatch.pl fixes for twl4030-usb.c
> >   I2C: TWL4030: checkpatch.pl fixes for twl4030-gpio.c
> >   I2C: TWL4030: checkpatch.pl fixes to tlw4030.h
> >   I2C: TLW4030: checkpatch.pl fixes to tlw4030-rtc.h
> >   I2C: TWL4030: checkpatch.pl fixes to rtc-twl4030.c
> >   USB: MUSB: checkpatch.pl fixes to cppi_dma.c
> >   USB: MUSB: checkpatch.pl fixes to davinci.c
> >   USB: MUSB: checkpatch.pl fixed to musb_core.c
> >   USB: MUSB: checkpatch.pl fixes to musb_gadget.c
> >   USB: MUSB: checkpatch.pl fixed to musb_gadget_ep0.c
> >   USB: MUSB: checkpatch.pl fixed to musb_host.c
> >   USB: MUSB: checkpatch.pl fixed to musb_procfs.c
> >   USB: MUSB: checkpatch.pl fixes to musb_virthub.c
> >   USB: MUSB: checkpatch.pl fixes to musbhsdma.c
> >   USB: MUSB: checkpatch.pl fixes to omap2430.c
> >   USB: MUSB: checkpatch.pl fixes to tusb6010.c
> >   USB: MUSB: checkpatch.pl fixes to tusb6010_omap.c
> >   USB: MUSB: checkpatch.pl fixes to davinci.h
> >   USB: MUSB: checkpatch.pl fixes to musb_core.h
> >   USB: MUSB: checkpatch.pl fixes to musb_io.h
> >   USB: MUSB: checkpatch.pl fixed to musb_regs.h
> >   USB: MUSB: checkpatch.pl fixes to musb_debug.h
> > 
> >  drivers/i2c/chips/twl4030-core.c   |   61 
> > +++++++++++++---------------
> >  drivers/i2c/chips/twl4030-gpio.c   |   37 ++++++++---------
> >  drivers/i2c/chips/twl4030-usb.c    |    3 +-
> >  drivers/rtc/rtc-twl4030.c          |   77 
> > ++++++++++++++++++-----------------
> >  drivers/usb/musb/cppi_dma.c        |    2 +-
> >  drivers/usb/musb/davinci.c         |    8 ++--
> >  drivers/usb/musb/davinci.h         |    4 +-
> >  drivers/usb/musb/musb_core.c       |   35 +++++++---------
> >  drivers/usb/musb/musb_core.h       |   10 ++--
> >  drivers/usb/musb/musb_debug.h      |   14 +++---
> >  drivers/usb/musb/musb_gadget.c     |   13 +++---
> >  drivers/usb/musb/musb_gadget_ep0.c |    2 +-
> >  drivers/usb/musb/musb_host.c       |   26 ++++++------
> >  drivers/usb/musb/musb_io.h         |    2 +-
> >  drivers/usb/musb/musb_procfs.c     |    8 ++--
> >  drivers/usb/musb/musb_regs.h       |   22 +++++-----
> >  drivers/usb/musb/musb_virthub.c    |    4 +-
> >  drivers/usb/musb/musbhsdma.c       |   17 ++++----
> >  drivers/usb/musb/omap2430.c        |    2 +-
> >  drivers/usb/musb/tusb6010.c        |   12 +++---
> >  drivers/usb/musb/tusb6010_omap.c   |   13 +++---
> >  include/linux/i2c/twl4030-rtc.h    |    4 +-
> >  include/linux/i2c/twl4030.h        |    6 +-
> >  23 files changed, 186 insertions(+), 196 deletions(-)
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe 
> > linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 

-- 
	- Balbi

Re: [PATCH 00/23] General checkpatch.pl cleanup for twl and musb drivers

[David Brownell]

On Friday 11 April 2008, Felipe Balbi wrote:
> scripts/checkpatch.pl --file drivers/usb/musb/*.[ch] ;-)

scripts/checkpatch.pl --strict --file drivers/usb/musb/*.[ch] ;-)
                      ^^^^^^^^

:)
    

Re: [PATCH 00/23] General checkpatch.pl cleanup for twl and musb drivers

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [080411 01:30]:
> The following series gets rid of checkpatch.pl ERRORS and WARNINGS
> for both twl4030 and musb drivers. I left some WARNINGS in musb_core.c
> because fixing them would decrease the code readability. Line was only one
> character over the 80 max so it didn't make sense to fix that.

Pushed, I had to tweak the first patch to apply, so please verify things
got patched OK.

Tony


> Felipe Balbi (23):
>   I2C: TWL4030: checkpatch.pl fixes for twl4030-core.c
>   I2C: TWL4030: checkpatch.pl fixes for twl4030-usb.c
>   I2C: TWL4030: checkpatch.pl fixes for twl4030-gpio.c
>   I2C: TWL4030: checkpatch.pl fixes to tlw4030.h
>   I2C: TLW4030: checkpatch.pl fixes to tlw4030-rtc.h
>   I2C: TWL4030: checkpatch.pl fixes to rtc-twl4030.c
>   USB: MUSB: checkpatch.pl fixes to cppi_dma.c
>   USB: MUSB: checkpatch.pl fixes to davinci.c
>   USB: MUSB: checkpatch.pl fixed to musb_core.c
>   USB: MUSB: checkpatch.pl fixes to musb_gadget.c
>   USB: MUSB: checkpatch.pl fixed to musb_gadget_ep0.c
>   USB: MUSB: checkpatch.pl fixed to musb_host.c
>   USB: MUSB: checkpatch.pl fixed to musb_procfs.c
>   USB: MUSB: checkpatch.pl fixes to musb_virthub.c
>   USB: MUSB: checkpatch.pl fixes to musbhsdma.c
>   USB: MUSB: checkpatch.pl fixes to omap2430.c
>   USB: MUSB: checkpatch.pl fixes to tusb6010.c
>   USB: MUSB: checkpatch.pl fixes to tusb6010_omap.c
>   USB: MUSB: checkpatch.pl fixes to davinci.h
>   USB: MUSB: checkpatch.pl fixes to musb_core.h
>   USB: MUSB: checkpatch.pl fixes to musb_io.h
>   USB: MUSB: checkpatch.pl fixed to musb_regs.h
>   USB: MUSB: checkpatch.pl fixes to musb_debug.h
> 
>  drivers/i2c/chips/twl4030-core.c   |   61 +++++++++++++---------------
>  drivers/i2c/chips/twl4030-gpio.c   |   37 ++++++++---------
>  drivers/i2c/chips/twl4030-usb.c    |    3 +-
>  drivers/rtc/rtc-twl4030.c          |   77 ++++++++++++++++++-----------------
>  drivers/usb/musb/cppi_dma.c        |    2 +-
>  drivers/usb/musb/davinci.c         |    8 ++--
>  drivers/usb/musb/davinci.h         |    4 +-
>  drivers/usb/musb/musb_core.c       |   35 +++++++---------
>  drivers/usb/musb/musb_core.h       |   10 ++--
>  drivers/usb/musb/musb_debug.h      |   14 +++---
>  drivers/usb/musb/musb_gadget.c     |   13 +++---
>  drivers/usb/musb/musb_gadget_ep0.c |    2 +-
>  drivers/usb/musb/musb_host.c       |   26 ++++++------
>  drivers/usb/musb/musb_io.h         |    2 +-
>  drivers/usb/musb/musb_procfs.c     |    8 ++--
>  drivers/usb/musb/musb_regs.h       |   22 +++++-----
>  drivers/usb/musb/musb_virthub.c    |    4 +-
>  drivers/usb/musb/musbhsdma.c       |   17 ++++----
>  drivers/usb/musb/omap2430.c        |    2 +-
>  drivers/usb/musb/tusb6010.c        |   12 +++---
>  drivers/usb/musb/tusb6010_omap.c   |   13 +++---
>  include/linux/i2c/twl4030-rtc.h    |    4 +-
>  include/linux/i2c/twl4030.h        |    6 +-
>  23 files changed, 186 insertions(+), 196 deletions(-)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html