I'm going through the subsystem rectifying all of the warnings/errors
checkpatch finds. Please review as appropriate.
Lee Jones (19):
mfd: max77686: Fix 'line over 80 chars' warning
mfd: max8925-i2c: Fix 'blank line after declarations' warning
mfd: tps80031: Fix 'missing break or fall-through comment' warning
mfd: mcp-core: Fix 'blank line after declarations' warning
mfd: wm8350-irq: Fix 'line over 80 chars' warning
mfd: dm355evm_msp: Fix checkpatch error: insert space after ','
mfd: sec-core: Fix 'missing blank line after declarations' warning
mfd: twl6040: Fix 'insert space after ','', error
mfd: ezx-pcap: Repair coding style errors picked up with checkpatch
mfd: lp8788-irq: Fix 'missing blank line after declarations' warning
mfd: twl4030-irq: Fix style warnings relating to pr_warn() and sizeof()
mfd: max8925-core: Fix 'missing blank line after declarations' warning
mfd: wm8350-i2c: Replace spaces with tabs
mfd: twl6030-irq: Extinguish coding style warnings
mfd: tc6387xb: Remove unnecessary braces and correct style warnings
mfd: si476x-cmd: Remedy checkpatch style complains
mfd: ipaq-micro: Fix coding style errors/warnings reported by checkpatch
mfd: kempld-core: Correct a variety of checkpatch warnings
mfd: wm8997-tables: Suppress 'line over 80 chars' warnings
drivers/mfd/dm355evm_msp.c | 2 +-
drivers/mfd/ezx-pcap.c | 6 +++---
drivers/mfd/ipaq-micro.c | 8 ++++----
drivers/mfd/kempld-core.c | 10 ++++++----
drivers/mfd/lp8788-irq.c | 2 ++
drivers/mfd/max77686.c | 2 +-
drivers/mfd/max8925-core.c | 2 ++
drivers/mfd/max8925-i2c.c | 2 ++
drivers/mfd/mcp-core.c | 1 +
drivers/mfd/sec-core.c | 1 +
drivers/mfd/si476x-cmd.c | 12 ++++++------
drivers/mfd/tc6387xb.c | 7 +++----
drivers/mfd/tps80031.c | 1 +
drivers/mfd/twl4030-irq.c | 6 +++---
drivers/mfd/twl6030-irq.c | 4 +++-
drivers/mfd/twl6040.c | 2 +-
drivers/mfd/wm8350-i2c.c | 8 ++++----
drivers/mfd/wm8350-irq.c | 3 ++-
drivers/mfd/wm8997-tables.c | 8 ++++----
19 files changed, 50 insertions(+), 37 deletions(-)
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
+WARNING: line over 80 characters
+ &max77686_rtc_regmap_config);
total: 0 errors, 1 warnings, 299 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/max77686.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 8650832..f2bd699 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -166,7 +166,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(max77686->rtc, max77686);
max77686->rtc_regmap = devm_regmap_init_i2c(max77686->rtc,
- &max77686_rtc_regmap_config);
+ &max77686_rtc_regmap_config);
if (IS_ERR(max77686->rtc_regmap)) {
ret = PTR_ERR(max77686->rtc_regmap);
dev_err(max77686->dev, "failed to allocate RTC regmap: %d\n",
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Missing a blank line after declarations
+ int ret;
+ ret = i2c_add_driver(&max8925_driver);
total: 0 errors, 1 warnings, 275 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/max8925-i2c.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index a83eed5..ecbe78e 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -257,9 +257,11 @@ static struct i2c_driver max8925_driver = {
static int __init max8925_i2c_init(void)
{
int ret;
+
ret = i2c_add_driver(&max8925_driver);
if (ret != 0)
pr_err("Failed to register MAX8925 I2C driver: %d\n", ret);
+
return ret;
}
subsys_initcall(max8925_i2c_init);
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
ERROR: space required after that ',' (ctx:VxV)
+#define MSP_GPIO(bit,reg) ((DM355EVM_MSP_ ## reg) << 3 | (bit))
^
total: 1 errors, 0 warnings, 437 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/dm355evm_msp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 7a55c00..4c826f7 100644
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -95,7 +95,7 @@ EXPORT_SYMBOL(dm355evm_msp_read);
* Many of the msp430 pins are just used as fixed-direction GPIOs.
* We could export a few more of them this way, if we wanted.
*/
-#define MSP_GPIO(bit,reg) ((DM355EVM_MSP_ ## reg) << 3 | (bit))
+#define MSP_GPIO(bit, reg) ((DM355EVM_MSP_ ## reg) << 3 | (bit))
static const u8 msp_gpios[] = {
/* eight leds */
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Missing a blank line after declarations
+ unsigned long flags;
+ spin_lock_irqsave(&mcp->lock, flags);
total: 0 errors, 1 warnings, 238 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/mcp-core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c
index 62e5e36..7f5066e 100644
--- a/drivers/mfd/mcp-core.c
+++ b/drivers/mfd/mcp-core.c
@@ -137,6 +137,7 @@ EXPORT_SYMBOL(mcp_reg_read);
void mcp_enable(struct mcp *mcp)
{
unsigned long flags;
+
spin_lock_irqsave(&mcp->lock, flags);
if (mcp->use_count++ == 0)
mcp->ops->enable(mcp);
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Missing a blank line after declarations
+ struct lp8788_irq_data *irqd = irq_data_get_irq_chip_data(data);
+ irqd->enabled[data->hwirq] = 1;
WARNING: Missing a blank line after declarations
+ struct lp8788_irq_data *irqd = irq_data_get_irq_chip_data(data);
+ irqd->enabled[data->hwirq] = 0;
total: 0 errors, 2 warnings, 198 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/lp8788-irq.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mfd/lp8788-irq.c b/drivers/mfd/lp8788-irq.c
index c84ded5..23982db 100644
--- a/drivers/mfd/lp8788-irq.c
+++ b/drivers/mfd/lp8788-irq.c
@@ -66,12 +66,14 @@ static inline u8 _irq_to_val(enum lp8788_int_id id, int enable)
static void lp8788_irq_enable(struct irq_data *data)
{
struct lp8788_irq_data *irqd = irq_data_get_irq_chip_data(data);
+
irqd->enabled[data->hwirq] = 1;
}
static void lp8788_irq_disable(struct irq_data *data)
{
struct lp8788_irq_data *irqd = irq_data_get_irq_chip_data(data);
+
irqd->enabled[data->hwirq] = 0;
}
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Missing a blank line after declarations
+ struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
+ max8925_irqs[data->irq - chip->irq_base].enable
WARNING: Missing a blank line after declarations
+ struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
+ max8925_irqs[data->irq - chip->irq_base].enable = 0;
total: 0 errors, 2 warnings, 927 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/max8925-core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index f3faf0c..97a787a 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -624,6 +624,7 @@ static void max8925_irq_sync_unlock(struct irq_data *data)
static void max8925_irq_enable(struct irq_data *data)
{
struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
+
max8925_irqs[data->irq - chip->irq_base].enable
= max8925_irqs[data->irq - chip->irq_base].offs;
}
@@ -631,6 +632,7 @@ static void max8925_irq_enable(struct irq_data *data)
static void max8925_irq_disable(struct irq_data *data)
{
struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
+
max8925_irqs[data->irq - chip->irq_base].enable = 0;
}
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
ERROR: space required before the open parenthesis '('
+ if(!micro->msg)
WARNING: unnecessary whitespace before a quoted newline
+ dev_dbg(micro->dev, "key message ignored, no handle \n");
WARNING: unnecessary whitespace before a quoted newline
+ dev_dbg(micro->dev, "touchscreen message ignored, no handle \n");
WARNING: space prohibited before semicolon
+ rx->id = (ch & 0xf0) >> 4 ;
total: 1 errors, 3 warnings, 482 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/ipaq-micro.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/ipaq-micro.c b/drivers/mfd/ipaq-micro.c
index 7e50fe0..8df3266 100644
--- a/drivers/mfd/ipaq-micro.c
+++ b/drivers/mfd/ipaq-micro.c
@@ -115,7 +115,7 @@ static void micro_rx_msg(struct ipaq_micro *micro, u8 id, int len, u8 *data)
} else {
dev_err(micro->dev,
"out of band RX message 0x%02x\n", id);
- if(!micro->msg)
+ if (!micro->msg)
dev_info(micro->dev, "no message queued\n");
else
dev_info(micro->dev, "expected message %02x\n",
@@ -126,13 +126,13 @@ static void micro_rx_msg(struct ipaq_micro *micro, u8 id, int len, u8 *data)
if (micro->key)
micro->key(micro->key_data, len, data);
else
- dev_dbg(micro->dev, "key message ignored, no handle \n");
+ dev_dbg(micro->dev, "key message ignored, no handle\n");
break;
case MSG_TOUCHSCREEN:
if (micro->ts)
micro->ts(micro->ts_data, len, data);
else
- dev_dbg(micro->dev, "touchscreen message ignored, no handle \n");
+ dev_dbg(micro->dev, "touchscreen message ignored, no handle\n");
break;
default:
dev_err(micro->dev,
@@ -154,7 +154,7 @@ static void micro_process_char(struct ipaq_micro *micro, u8 ch)
rx->state = STATE_ID; /* Next byte is the id and len */
break;
case STATE_ID: /* Looking for id and len byte */
- rx->id = (ch & 0xf0) >> 4 ;
+ rx->id = (ch & 0xf0) >> 4;
rx->len = (ch & 0x0f);
rx->index = 0;
rx->chksum = ch;
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: please, no space before tabs
+^IRSV_INTR_OFFSET, ^I/* Bit 12^IReserved^I^I*/$
WARNING: Missing a blank line after declarations
+ u8 unmask_value;
+ ret = twl_i2c_read_u8(TWL_MODULE_PIH, &unmask_value,
WARNING: Missing a blank line after declarations
+ u8 mask_value;
+ ret = twl_i2c_read_u8(TWL_MODULE_PIH, &mask_value,
total: 0 errors, 3 warnings, 484 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/twl6030-irq.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index a6bb17d..2807e1a 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -70,7 +70,7 @@ static int twl6030_interrupt_mapping[24] = {
BATDETECT_INTR_OFFSET, /* Bit 9 BAT */
SIMDETECT_INTR_OFFSET, /* Bit 10 SIM */
MMCDETECT_INTR_OFFSET, /* Bit 11 MMC */
- RSV_INTR_OFFSET, /* Bit 12 Reserved */
+ RSV_INTR_OFFSET, /* Bit 12 Reserved */
MADC_INTR_OFFSET, /* Bit 13 GPADC_RT_EOC */
MADC_INTR_OFFSET, /* Bit 14 GPADC_SW_EOC */
GASGAUGE_INTR_OFFSET, /* Bit 15 CC_AUTOCAL */
@@ -245,6 +245,7 @@ int twl6030_interrupt_unmask(u8 bit_mask, u8 offset)
{
int ret;
u8 unmask_value;
+
ret = twl_i2c_read_u8(TWL_MODULE_PIH, &unmask_value,
REG_INT_STS_A + offset);
unmask_value &= (~(bit_mask));
@@ -258,6 +259,7 @@ int twl6030_interrupt_mask(u8 bit_mask, u8 offset)
{
int ret;
u8 mask_value;
+
ret = twl_i2c_read_u8(TWL_MODULE_PIH, &mask_value,
REG_INT_STS_A + offset);
mask_value |= (bit_mask);
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: line over 80 characters
+ { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 3 */
WARNING: line over 80 characters
+ { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 4 */
WARNING: line over 80 characters
+ { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 5 */
WARNING: line over 80 characters
+ { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 6 */
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/wm8997-tables.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
index c7a81da..04bc6d5 100644
--- a/drivers/mfd/wm8997-tables.c
+++ b/drivers/mfd/wm8997-tables.c
@@ -174,10 +174,10 @@ static const struct reg_default wm8997_reg_default[] = {
{ 0x00000062, 0x01FF }, /* R98 - Sample Rate Sequence Select 2 */
{ 0x00000063, 0x01FF }, /* R99 - Sample Rate Sequence Select 3 */
{ 0x00000064, 0x01FF }, /* R100 - Sample Rate Sequence Select 4 */
- { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 3 */
- { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 4 */
- { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 5 */
- { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 6 */
+ { 0x00000068, 0x01FF }, /* R104 - AlwaysOn Triggers Seq Select 3 */
+ { 0x00000069, 0x01FF }, /* R105 - AlwaysOn Triggers Seq Select 4 */
+ { 0x0000006A, 0x01FF }, /* R106 - AlwaysOn Triggers Seq Select 5 */
+ { 0x0000006B, 0x01FF }, /* R107 - AlwaysOn Triggers Seq Select 6 */
{ 0x00000070, 0x0000 }, /* R112 - Comfort Noise Generator */
{ 0x00000090, 0x0000 }, /* R144 - Haptics Control 1 */
{ 0x00000091, 0x7FFF }, /* R145 - Haptics Control 2 */
--
1.8.3.2
WARNING: line over 80 characters
+module_param_string(force_device_id, force_device_id, sizeof(force_device_id), 0);
WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt
+ msleep(1);
WARNING: __initdata should be placed after kempld_dmi_table[]
+static struct dmi_system_id __initdata kempld_dmi_table[] = {
WARNING: line over 80 characters
+ for (id = kempld_dmi_table; id->matches[0].slot != DMI_NONE; id++)
total: 0 errors, 4 warnings, 771 lines checked
This is part of an effort to clean-up the MFD subsystem.
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/kempld-core.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index f7ff018..bd26961 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -24,7 +24,8 @@
#define MAX_ID_LEN 4
static char force_device_id[MAX_ID_LEN + 1] = "";
-module_param_string(force_device_id, force_device_id, sizeof(force_device_id), 0);
+module_param_string(force_device_id, force_device_id,
+ sizeof(force_device_id), 0);
MODULE_PARM_DESC(force_device_id, "Override detected product");
/*
@@ -36,7 +37,7 @@ static void kempld_get_hardware_mutex(struct kempld_device_data *pld)
{
/* The mutex bit will read 1 until access has been granted */
while (ioread8(pld->io_index) & KEMPLD_MUTEX_KEY)
- msleep(1);
+ usleep_range(1000, 3000);
}
static void kempld_release_hardware_mutex(struct kempld_device_data *pld)
@@ -499,7 +500,7 @@ static struct platform_driver kempld_driver = {
.remove = kempld_remove,
};
-static struct dmi_system_id __initdata kempld_dmi_table[] = {
+static struct dmi_system_id kempld_dmi_table[] __initdata = {
{
.ident = "BHL6",
.matches = {
@@ -736,7 +737,8 @@ static int __init kempld_init(void)
int ret;
if (force_device_id[0]) {
- for (id = kempld_dmi_table; id->matches[0].slot != DMI_NONE; id++)
+ for (id = kempld_dmi_table;
+ id->matches[0].slot != DMI_NONE; id++)
if (strstr(id->ident, force_device_id))
if (id->callback && id->callback(id))
break;
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: line over 80 characters
+ struct si476x_rsq_status_args *rsqargs,
WARNING: line over 80 characters
+ struct si476x_rsq_status_report *report)
WARNING: Unnecessary space before function pointer arguments
+ int (*power_up) (struct si476x_core *,
WARNING: Unnecessary space before function pointer arguments
+ int (*power_down) (struct si476x_core *,
total: 0 errors, 4 warnings, 1555 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/si476x-cmd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/mfd/si476x-cmd.c b/drivers/mfd/si476x-cmd.c
index 6f1ef63..2086b46 100644
--- a/drivers/mfd/si476x-cmd.c
+++ b/drivers/mfd/si476x-cmd.c
@@ -1228,8 +1228,8 @@ static int si476x_core_cmd_fm_rsq_status_a10(struct si476x_core *core,
}
static int si476x_core_cmd_fm_rsq_status_a20(struct si476x_core *core,
- struct si476x_rsq_status_args *rsqargs,
- struct si476x_rsq_status_report *report)
+ struct si476x_rsq_status_args *rsqargs,
+ struct si476x_rsq_status_report *report)
{
int err;
u8 resp[CMD_FM_RSQ_STATUS_A10_NRESP];
@@ -1434,10 +1434,10 @@ typedef int (*tune_freq_func_t) (struct si476x_core *core,
struct si476x_tune_freq_args *tuneargs);
static struct {
- int (*power_up) (struct si476x_core *,
- struct si476x_power_up_args *);
- int (*power_down) (struct si476x_core *,
- struct si476x_power_down_args *);
+ int (*power_up)(struct si476x_core *,
+ struct si476x_power_up_args *);
+ int (*power_down)(struct si476x_core *,
+ struct si476x_power_down_args *);
tune_freq_func_t fm_tune_freq;
tune_freq_func_t am_tune_freq;
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: braces {} are not necessary for single statement blocks
+ if (!iomem) {
+ return -EINVAL;
+ }
WARNING: sizeof *tc6387xb should be sizeof(*tc6387xb)
+ tc6387xb = kzalloc(sizeof *tc6387xb, GFP_KERNEL);
WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
+ printk(KERN_INFO "Toshiba tc6387xb initialised\n");
total: 0 errors, 3 warnings, 242 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/tc6387xb.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 591a331..e71f880 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -147,11 +147,10 @@ static int tc6387xb_probe(struct platform_device *dev)
int irq, ret;
iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
- if (!iomem) {
+ if (!iomem)
return -EINVAL;
- }
- tc6387xb = kzalloc(sizeof *tc6387xb, GFP_KERNEL);
+ tc6387xb = kzalloc(sizeof(*tc6387xb), GFP_KERNEL);
if (!tc6387xb)
return -ENOMEM;
@@ -189,7 +188,7 @@ static int tc6387xb_probe(struct platform_device *dev)
if (pdata && pdata->enable)
pdata->enable(dev);
- printk(KERN_INFO "Toshiba tc6387xb initialised\n");
+ dev_info(&dev->dev, "Toshiba tc6387xb initialised\n");
ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,
ARRAY_SIZE(tc6387xb_cells), iomem, irq, NULL);
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: please, no spaces at the start of a line
+ { "wm8350", 0 },$
WARNING: please, no spaces at the start of a line
+ { "wm8351", 0 },$
WARNING: please, no spaces at the start of a line
+ { "wm8352", 0 },$
WARNING: please, no spaces at the start of a line
+ { }$
total: 0 errors, 4 warnings, 93 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/wm8350-i2c.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
index f919def..6a16a8a 100644
--- a/drivers/mfd/wm8350-i2c.c
+++ b/drivers/mfd/wm8350-i2c.c
@@ -58,10 +58,10 @@ static int wm8350_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id wm8350_i2c_id[] = {
- { "wm8350", 0 },
- { "wm8351", 0 },
- { "wm8352", 0 },
- { }
+ { "wm8350", 0 },
+ { "wm8351", 0 },
+ { "wm8352", 0 },
+ { }
};
MODULE_DEVICE_TABLE(i2c, wm8350_i2c_id);
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Prefer pr_warn(... to pr_warning(...
+ pr_warning("twl4030: I2C error %d reading PIH ISR\n", ret);
WARNING: sizeof buf should be sizeof(buf)
+ memset(buf, 0xff, sizeof buf);
WARNING: sizeof *agent should be sizeof(*agent)
+ agent = kzalloc(sizeof *agent, GFP_KERNEL);
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/twl4030-irq.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 596b1f6..b1dabba 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -297,7 +297,7 @@ static irqreturn_t handle_twl4030_pih(int irq, void *devid)
ret = twl_i2c_read_u8(TWL_MODULE_PIH, &pih_isr,
REG_PIH_ISR_P1);
if (ret) {
- pr_warning("twl4030: I2C error %d reading PIH ISR\n", ret);
+ pr_warn("twl4030: I2C error %d reading PIH ISR\n", ret);
return IRQ_NONE;
}
@@ -338,7 +338,7 @@ static int twl4030_init_sih_modules(unsigned line)
irq_line = line;
/* disable all interrupts on our line */
- memset(buf, 0xff, sizeof buf);
+ memset(buf, 0xff, sizeof(buf));
sih = sih_modules;
for (i = 0; i < nr_sih_modules; i++, sih++) {
/* skip USB -- it's funky */
@@ -646,7 +646,7 @@ int twl4030_sih_setup(struct device *dev, int module, int irq_base)
if (status < 0)
return status;
- agent = kzalloc(sizeof *agent, GFP_KERNEL);
+ agent = kzalloc(sizeof(*agent), GFP_KERNEL);
if (!agent)
return -ENOMEM;
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Missing a blank line after declarations
+ u32 flags;
+ void (*callback)(void *, u16[]);
WARNING: sizeof t should be sizeof(t)
+ memset(&t, 0, sizeof t);
WARNING: void function return statements are not generally useful
+ return;
+}
total: 0 errors, 3 warnings, 542 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/ezx-pcap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 2ed774e..5a9a35e 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -25,8 +25,9 @@ struct pcap_adc_request {
u8 bank;
u8 ch[2];
u32 flags;
- void (*callback)(void *, u16[]);
void *data;
+
+ void (*callback)(void *, u16[]);
};
struct pcap_adc_sync_request {
@@ -62,7 +63,7 @@ static int ezx_pcap_putget(struct pcap_chip *pcap, u32 *data)
struct spi_message m;
int status;
- memset(&t, 0, sizeof t);
+ memset(&t, 0, sizeof(t));
spi_message_init(&m);
t.len = sizeof(u32);
spi_message_add_tail(&t, &m);
@@ -211,7 +212,6 @@ static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
desc->irq_data.chip->irq_ack(&desc->irq_data);
queue_work(pcap->workqueue, &pcap->isr_work);
- return;
}
/* ADC */
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
ERROR: space required after that ',' (ctx:VxO)
+ 0, &twl6040_irq_chip,&twl6040->irq_data);
^
ERROR: space required before that '&' (ctx:OxV)
+ 0, &twl6040_irq_chip,&twl6040->irq_data);
^
total: 2 errors, 0 warnings, 816 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/twl6040.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index ae26d84..f9c06c5 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -700,7 +700,7 @@ static int twl6040_probe(struct i2c_client *client,
}
ret = regmap_add_irq_chip(twl6040->regmap, twl6040->irq, IRQF_ONESHOT,
- 0, &twl6040_irq_chip,&twl6040->irq_data);
+ 0, &twl6040_irq_chip, &twl6040->irq_data);
if (ret < 0)
goto gpio_err;
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Missing a blank line after declarations
+ const struct of_device_id *match;
+ match = of_match_node(sec_dt_match, i2c->dev.of_node);
total: 0 errors, 1 warnings, 494 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/sec-core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index fb8ba64..dba7e2b 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -273,6 +273,7 @@ static inline unsigned long sec_i2c_get_driver_data(struct i2c_client *i2c,
#ifdef CONFIG_OF
if (i2c->dev.of_node) {
const struct of_device_id *match;
+
match = of_match_node(sec_dt_match, i2c->dev.of_node);
return (unsigned long)match->data;
}
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: line over 80 characters
+ wm8350->irq_base = irq_alloc_descs(irq_base, 0, ARRAY_SIZE(wm8350_irqs), 0);
total: 0 errors, 1 warnings, 552 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/wm8350-irq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c
index cd01f79..813ff50 100644
--- a/drivers/mfd/wm8350-irq.c
+++ b/drivers/mfd/wm8350-irq.c
@@ -497,7 +497,8 @@ int wm8350_irq_init(struct wm8350 *wm8350, int irq,
if (pdata && pdata->irq_base > 0)
irq_base = pdata->irq_base;
- wm8350->irq_base = irq_alloc_descs(irq_base, 0, ARRAY_SIZE(wm8350_irqs), 0);
+ wm8350->irq_base =
+ irq_alloc_descs(irq_base, 0, ARRAY_SIZE(wm8350_irqs), 0);
if (wm8350->irq_base < 0) {
dev_warn(wm8350->dev, "Allocating irqs failed with %d\n",
wm8350->irq_base);
--
1.8.3.2
This is part of an effort to clean-up the MFD subsystem.
WARNING: Possible switch case/default not preceeded by break or fallthrough comment
+ case TPS80031_BACKUP_REG:
total: 0 errors, 1 warnings, 573 lines checked
Signed-off-by: Lee Jones <[email protected]>
---
drivers/mfd/tps80031.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mfd/tps80031.c b/drivers/mfd/tps80031.c
index ed6c5b0..7a3806c 100644
--- a/drivers/mfd/tps80031.c
+++ b/drivers/mfd/tps80031.c
@@ -334,6 +334,7 @@ static bool rd_wr_reg_id1(struct device *dev, unsigned int reg)
case TPS80031_PREQ1_RES_ASS_A ... TPS80031_PREQ3_RES_ASS_C:
case TPS80031_SMPS_OFFSET ... TPS80031_BATDEBOUNCING:
case TPS80031_CFG_INPUT_PUPD1 ... TPS80031_CFG_SMPS_PD:
+ /* Fall through */
case TPS80031_BACKUP_REG:
return true;
default:
--
1.8.3.2
On Tuesday 22 July 2014 12:11:09 Lee Jones wrote:
> --- a/drivers/mfd/tps80031.c
> +++ b/drivers/mfd/tps80031.c
> @@ -334,6 +334,7 @@ static bool rd_wr_reg_id1(struct device *dev, unsigned int reg)
> case TPS80031_PREQ1_RES_ASS_A ... TPS80031_PREQ3_RES_ASS_C:
> case TPS80031_SMPS_OFFSET ... TPS80031_BATDEBOUNCING:
> case TPS80031_CFG_INPUT_PUPD1 ... TPS80031_CFG_SMPS_PD:
> + /* Fall through */
> case TPS80031_BACKUP_REG:
> return true;
> default:
This one seems to make the code look worse: You are only adding the comment
to one case, not all of them, and it was perfectly understandable
before.
Further, there are a couple of other functions following this one that
also don't have that comment.
It seems checkpatch missed all the other cases because they contain '...'
lists, whereas the one above does not. I think it's better left alone.
Arnd
On Tue, Jul 22, 2014 at 4:41 PM, Lee Jones <[email protected]> wrote:
> This is part of an effort to clean-up the MFD subsystem.
>
<snip>
> max77686->rtc_regmap = devm_regmap_init_i2c(max77686->rtc,
Which kernel are you on? Because 3.16.rc6 does not match with these
lines. Its something like this:
'max77686->regmap = devm_regmap_init_i2c(i2c,
&max77686_regmap_config);'
Sorry if I am missing something.
> Please read the FAQ at http://www.tux.org/lkml/
--
Thanks and Regards
Pramod
On Tue, Jul 22, 2014 at 4:41 PM, Lee Jones <[email protected]> wrote:
> This is part of an effort to clean-up the MFD subsystem.
>
> WARNING: Missing a blank line after declarations
> + int ret;
> + ret = i2c_add_driver(&max8925_driver);
>
> total: 0 errors, 1 warnings, 275 lines checked
>
> Signed-off-by: Lee Jones <[email protected]>
> ---
> drivers/mfd/max8925-i2c.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
> index a83eed5..ecbe78e 100644
> --- a/drivers/mfd/max8925-i2c.c
> +++ b/drivers/mfd/max8925-i2c.c
> @@ -257,9 +257,11 @@ static struct i2c_driver max8925_driver = {
> static int __init max8925_i2c_init(void)
> {
> int ret;
> +
> ret = i2c_add_driver(&max8925_driver);
> if (ret != 0)
> pr_err("Failed to register MAX8925 I2C driver: %d\n", ret);
> +
There are more such changes required in this file. If they could go
with this, will be good.
> return ret;
> }
> subsys_initcall(max8925_i2c_init);
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Thanks and Regards
Pramod
On Tue, 22 Jul 2014, Arnd Bergmann wrote:
> On Tuesday 22 July 2014 12:11:09 Lee Jones wrote:
> > --- a/drivers/mfd/tps80031.c
> > +++ b/drivers/mfd/tps80031.c
> > @@ -334,6 +334,7 @@ static bool rd_wr_reg_id1(struct device *dev, unsigned int reg)
> > case TPS80031_PREQ1_RES_ASS_A ... TPS80031_PREQ3_RES_ASS_C:
> > case TPS80031_SMPS_OFFSET ... TPS80031_BATDEBOUNCING:
> > case TPS80031_CFG_INPUT_PUPD1 ... TPS80031_CFG_SMPS_PD:
> > + /* Fall through */
> > case TPS80031_BACKUP_REG:
> > return true;
> > default:
>
> This one seems to make the code look worse: You are only adding the comment
> to one case, not all of them, and it was perfectly understandable
> before.
>
> Further, there are a couple of other functions following this one that
> also don't have that comment.
>
> It seems checkpatch missed all the other cases because they contain '...'
> lists, whereas the one above does not. I think it's better left alone.
You're right. I forgot to remove this patch from the set.
Please see: https://lkml.org/lkml/2014/7/21/223
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Tue, 22 Jul 2014, pramod gurav wrote:
> On Tue, Jul 22, 2014 at 4:41 PM, Lee Jones <[email protected]> wrote:
> > This is part of an effort to clean-up the MFD subsystem.
> >
> <snip>
> > max77686->rtc_regmap = devm_regmap_init_i2c(max77686->rtc,
> Which kernel are you on? Because 3.16.rc6 does not match with these
> lines. Its something like this:
> 'max77686->regmap = devm_regmap_init_i2c(i2c,
> &max77686_regmap_config);'
>
> Sorry if I am missing something.
It's based on the most recent MFD for-mfd-next branch.
You're missing the following patches:
mfd: max77686: Remove unneeded OOM error message
mfd: max77686: Make error checking consistent
mfd: max77686: Return correct error when pdata isn't found
mfd: max77686: Make platform data over-rule DT
mfd: max77686: Don't define dummy function if OF isn't enabled
mfd: max77686: Add power management support
mfd: max77686: Convert to use regmap_irq
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Tue, 22 Jul 2014, pramod gurav wrote:
> On Tue, Jul 22, 2014 at 4:41 PM, Lee Jones <[email protected]> wrote:
> > This is part of an effort to clean-up the MFD subsystem.
> >
> > WARNING: Missing a blank line after declarations
> > + int ret;
> > + ret = i2c_add_driver(&max8925_driver);
> >
> > total: 0 errors, 1 warnings, 275 lines checked
> >
> > Signed-off-by: Lee Jones <[email protected]>
> > ---
> > drivers/mfd/max8925-i2c.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
> > index a83eed5..ecbe78e 100644
> > --- a/drivers/mfd/max8925-i2c.c
> > +++ b/drivers/mfd/max8925-i2c.c
> > @@ -257,9 +257,11 @@ static struct i2c_driver max8925_driver = {
> > static int __init max8925_i2c_init(void)
> > {
> > int ret;
> > +
> > ret = i2c_add_driver(&max8925_driver);
> > if (ret != 0)
> > pr_err("Failed to register MAX8925 I2C driver: %d\n", ret);
> > +
> There are more such changes required in this file. If they could go
> with this, will be good.
Checkpatch only found this one:
> WARNING: Missing a blank line after declarations
> #260: FILE: drivers/mfd/max8925-i2c.c:260:
> + int ret;
> + ret = i2c_add_driver(&max8925_driver);
>
> total: 0 errors, 1 warnings, 275 lines checked
Can you point me to the others please?
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Tue, Jul 22, 2014 at 5:43 PM, Lee Jones <[email protected]> wrote:
> On Tue, 22 Jul 2014, pramod gurav wrote:
>
> It's based on the most recent MFD for-mfd-next branch.
>
> You're missing the following patches:
>
> mfd: max77686: Remove unneeded OOM error message
> mfd: max77686: Make error checking consistent
> mfd: max77686: Return correct error when pdata isn't found
> mfd: max77686: Make platform data over-rule DT
> mfd: max77686: Don't define dummy function if OF isn't enabled
> mfd: max77686: Add power management support
> mfd: max77686: Convert to use regmap_irq
>
ok. Thanks. :)
> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog
--
Thanks and Regards
Pramod
On Tue, 2014-07-22 at 12:11 +0100, Lee Jones wrote:
> This is part of an effort to clean-up the MFD subsystem.
>
> WARNING: Missing a blank line after declarations
> + u32 flags;
> + void (*callback)(void *, u16[]);
False positive from an old version of checkpatch.
The one in -next doesn't emit this as it's
simply a function pointer declaration.
> diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
[]
> @@ -25,8 +25,9 @@ struct pcap_adc_request {
> u8 bank;
> u8 ch[2];
> u32 flags;
> - void (*callback)(void *, u16[]);
> void *data;
> +
> + void (*callback)(void *, u16[]);
> };
On Tue, 22 Jul 2014, Joe Perches wrote:
> On Tue, 2014-07-22 at 12:11 +0100, Lee Jones wrote:
> > This is part of an effort to clean-up the MFD subsystem.
> >
> > WARNING: Missing a blank line after declarations
> > + u32 flags;
> > + void (*callback)(void *, u16[]);
>
> False positive from an old version of checkpatch.
>
> The one in -next doesn't emit this as it's
> simply a function pointer declaration.
Thanks Joe, will fix up.
> > diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
> []
> > @@ -25,8 +25,9 @@ struct pcap_adc_request {
> > u8 bank;
> > u8 ch[2];
> > u32 flags;
> > - void (*callback)(void *, u16[]);
> > void *data;
> > +
> > + void (*callback)(void *, u16[]);
> > };
>
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Tue, 22 Jul 2014, pramod gurav wrote:
> On Tue, Jul 22, 2014 at 5:45 PM, Lee Jones <[email protected]> wrote:
> > On Tue, 22 Jul 2014, pramod gurav wrote:
> >> There are more such changes required in this file. If they could go
> >> with this, will be good.
> >
> > Checkpatch only found this one:
> Yes, there is only one missing blank warning in this source file. What
> I was pointing out to was the extra line you added before return
> statement. There are more such extra lines needed.
> I created a patch for that but I am not sure how I would insert that
> here in between this reply.
Well to be honest, I was just being cheeky with that change, as it's
not really an issue, just a preference of mine. If you really feel
passionate about it I will accept your patch if you submit it based on
for-mfd-next in the MFD repo [1].
> >> WARNING: Missing a blank line after declarations
> >> #260: FILE: drivers/mfd/max8925-i2c.c:260:
> >> + int ret;
> >> + ret = i2c_add_driver(&max8925_driver);
> >>
> >> total: 0 errors, 1 warnings, 275 lines checked
> >
> > Can you point me to the others please?
[1] git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog