From 776f157df120e7209e79918b694e26dc07a8ead9 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 10 Apr 2008 15:40:37 +0300 Subject: [PATCH] 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 Signed-off-by: Tony Lindgren --- drivers/i2c/chips/Kconfig | 8 ++++---- drivers/i2c/chips/twl4030-pwrbutton.c | 10 +++++----- drivers/i2c/chips/twl4030-usb.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index 4896f8499ce..c3de7352cd2 100644 --- 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 a541ed63101..cbc31aa3378 100644 --- 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 e6e995ce81c..5cf1c5c03f1 100644 --- 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; } -- 2.41.0