I2C: TWL4030: General cleanup in twl4030's driver

TWL4030's Kconfig entries was a bit mixed.
Fix some missing '\n'
Add missing space in two-lined printks

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 4896f8499ceca6b0b71fd628ff037b969a69887b..c3de7352cd2d5c262cdc4562d511b2c6de741384 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -132,10 +132,6 @@ config TWL4030_USB
        bool "TWL4030 USB Transceiver Driver"
        depends on TWL4030_CORE
 
-config TWL4030_PWRBUTTON
-        bool "TWL4030 Power button Driver"
-       depends on TWL4030_CORE
-
 choice
        prompt "Transceiver mode"
        depends on TWL4030_USB
@@ -143,6 +139,10 @@ choice
          TWL4030 USB transceiver can operate in various
          mutually-exclusive modes. Select one of them.
 
+config TWL4030_PWRBUTTON
+        bool "TWL4030 Power button Driver"
+       depends on TWL4030_CORE
+
 config TWL4030_USB_HS_ULPI
        depends on TWL4030_USB
        bool "High-speed ULPI"

diff --git a/drivers/i2c/chips/twl4030-pwrbutton.c b/drivers/i2c/chips/twl4030-pwrbutton.c
index a541ed6310137242f36ed8e603b70b88f667ecdc..cbc31aa33781cee02048e3273f7c8a847d484a0e 100644 (file)
--- a/drivers/i2c/chips/twl4030-pwrbutton.c
+++ b/drivers/i2c/chips/twl4030-pwrbutton.c
@@ -64,7 +64,7 @@ static irqreturn_t powerbutton_irq(int irq, void *dev_id)
                                 value & PWR_PWRON_IRQ);
        } else {
                printk(KERN_WARNING "I2C error %d while reading TWL4030"
-                       "PM_MASTER STS_HW_CONDITIONS register\n", err);
+                       " PM_MASTER STS_HW_CONDITIONS register\n", err);
        }
 
        return IRQ_HANDLED;
@@ -101,7 +101,7 @@ static int __init twl4030_pwrbutton_init(void)
        err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_IMR1);
        if (err) {
                printk(KERN_WARNING "I2C error %d while reading TWL4030"
-                                       "INT PWR_IMR1 register\n", err);
+                                       " INT PWR_IMR1 register\n", err);
 
                goto free_input_dev;
        }
@@ -110,14 +110,14 @@ static int __init twl4030_pwrbutton_init(void)
                                   value & (~PWR_PWRON_IRQ), PWR_IMR1);
        if (err) {
                printk(KERN_WARNING "I2C error %d while writing TWL4030"
-                                   "INT PWR_IMR1 register\n", err);
+                                   " INT PWR_IMR1 register\n", err);
                goto free_input_dev;
        }
 
        err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_EDR1);
        if (err) {
                printk(KERN_WARNING "I2C error %d while reading TWL4030"
-                                       "INT PWR_EDR1 register\n", err);
+                                       " INT PWR_EDR1 register\n", err);
                goto free_input_dev;
        }
 
@@ -126,7 +126,7 @@ static int __init twl4030_pwrbutton_init(void)
 
        if (err) {
                printk(KERN_WARNING "I2C error %d while writing TWL4030"
-                                       "INT PWR_EDR1 register\n", err);
+                                       " INT PWR_EDR1 register\n", err);
                goto free_input_dev;
        }
 

diff --git a/drivers/i2c/chips/twl4030-usb.c b/drivers/i2c/chips/twl4030-usb.c
index e6e995ce81cc3fa26e5476e3f0b79ef767f861b9..5cf1c5c03f10448961de06db124822b1e9cd5e02 100644 (file)
--- a/drivers/i2c/chips/twl4030-usb.c
+++ b/drivers/i2c/chips/twl4030-usb.c
@@ -727,7 +727,7 @@ static int __init twl4030_usb_init(void)
 
        otg_set_transceiver(&twl->otg);
 
-       printk(KERN_INFO "Initialized TWL4030 USB module");
+       printk(KERN_INFO "Initialized TWL4030 USB module\n");
 
        return 0;
 }