Commit 776f157d authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren

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: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fb34e14b
...@@ -132,10 +132,6 @@ config TWL4030_USB ...@@ -132,10 +132,6 @@ config TWL4030_USB
bool "TWL4030 USB Transceiver Driver" bool "TWL4030 USB Transceiver Driver"
depends on TWL4030_CORE depends on TWL4030_CORE
config TWL4030_PWRBUTTON
bool "TWL4030 Power button Driver"
depends on TWL4030_CORE
choice choice
prompt "Transceiver mode" prompt "Transceiver mode"
depends on TWL4030_USB depends on TWL4030_USB
...@@ -143,6 +139,10 @@ choice ...@@ -143,6 +139,10 @@ choice
TWL4030 USB transceiver can operate in various TWL4030 USB transceiver can operate in various
mutually-exclusive modes. Select one of them. mutually-exclusive modes. Select one of them.
config TWL4030_PWRBUTTON
bool "TWL4030 Power button Driver"
depends on TWL4030_CORE
config TWL4030_USB_HS_ULPI config TWL4030_USB_HS_ULPI
depends on TWL4030_USB depends on TWL4030_USB
bool "High-speed ULPI" bool "High-speed ULPI"
......
...@@ -64,7 +64,7 @@ static irqreturn_t powerbutton_irq(int irq, void *dev_id) ...@@ -64,7 +64,7 @@ static irqreturn_t powerbutton_irq(int irq, void *dev_id)
value & PWR_PWRON_IRQ); value & PWR_PWRON_IRQ);
} else { } else {
printk(KERN_WARNING "I2C error %d while reading TWL4030" 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; return IRQ_HANDLED;
...@@ -101,7 +101,7 @@ static int __init twl4030_pwrbutton_init(void) ...@@ -101,7 +101,7 @@ static int __init twl4030_pwrbutton_init(void)
err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_IMR1); err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_IMR1);
if (err) { if (err) {
printk(KERN_WARNING "I2C error %d while reading TWL4030" 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; goto free_input_dev;
} }
...@@ -110,14 +110,14 @@ static int __init twl4030_pwrbutton_init(void) ...@@ -110,14 +110,14 @@ static int __init twl4030_pwrbutton_init(void)
value & (~PWR_PWRON_IRQ), PWR_IMR1); value & (~PWR_PWRON_IRQ), PWR_IMR1);
if (err) { if (err) {
printk(KERN_WARNING "I2C error %d while writing TWL4030" 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; goto free_input_dev;
} }
err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_EDR1); err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_EDR1);
if (err) { if (err) {
printk(KERN_WARNING "I2C error %d while reading TWL4030" 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; goto free_input_dev;
} }
...@@ -126,7 +126,7 @@ static int __init twl4030_pwrbutton_init(void) ...@@ -126,7 +126,7 @@ static int __init twl4030_pwrbutton_init(void)
if (err) { if (err) {
printk(KERN_WARNING "I2C error %d while writing TWL4030" 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; goto free_input_dev;
} }
......
...@@ -727,7 +727,7 @@ static int __init twl4030_usb_init(void) ...@@ -727,7 +727,7 @@ static int __init twl4030_usb_init(void)
otg_set_transceiver(&twl->otg); otg_set_transceiver(&twl->otg);
printk(KERN_INFO "Initialized TWL4030 USB module"); printk(KERN_INFO "Initialized TWL4030 USB module\n");
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment