Commit 15544cab authored by Lee Jones's avatar Lee Jones

mfd: ab3100-core.c: Fix multiple warnings reported by Checkpatch

WARNING: Missing a blank line after declarations
+       struct ab3100 *ab3100 = dev_get_drvdata(dev->parent);
+       if (!ab3100->startup_events_read)

WARNING: Possible unnecessary 'out of memory' message
+       if (!ab3100) {
+               dev_err(&client->dev, "could not allocate AB3100 device\n");

WARNING: else is not generally useful after a break or return
+                               break;
+                       } else {

total: 0 errors, 3 warnings, 996 lines checked

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 4374b20c
...@@ -381,9 +381,11 @@ static int ab3100_event_registers_startup_state_get(struct device *dev, ...@@ -381,9 +381,11 @@ static int ab3100_event_registers_startup_state_get(struct device *dev,
u8 *event) u8 *event)
{ {
struct ab3100 *ab3100 = dev_get_drvdata(dev->parent); struct ab3100 *ab3100 = dev_get_drvdata(dev->parent);
if (!ab3100->startup_events_read) if (!ab3100->startup_events_read)
return -EAGAIN; /* Try again later */ return -EAGAIN; /* Try again later */
memcpy(event, ab3100->startup_events, 3); memcpy(event, ab3100->startup_events, 3);
return 0; return 0;
} }
...@@ -858,10 +860,8 @@ static int ab3100_probe(struct i2c_client *client, ...@@ -858,10 +860,8 @@ static int ab3100_probe(struct i2c_client *client,
int i; int i;
ab3100 = devm_kzalloc(&client->dev, sizeof(struct ab3100), GFP_KERNEL); ab3100 = devm_kzalloc(&client->dev, sizeof(struct ab3100), GFP_KERNEL);
if (!ab3100) { if (!ab3100)
dev_err(&client->dev, "could not allocate AB3100 device\n");
return -ENOMEM; return -ENOMEM;
}
/* Initialize data structure */ /* Initialize data structure */
mutex_init(&ab3100->access_mutex); mutex_init(&ab3100->access_mutex);
...@@ -883,20 +883,17 @@ static int ab3100_probe(struct i2c_client *client, ...@@ -883,20 +883,17 @@ static int ab3100_probe(struct i2c_client *client,
for (i = 0; ids[i].id != 0x0; i++) { for (i = 0; ids[i].id != 0x0; i++) {
if (ids[i].id == ab3100->chip_id) { if (ids[i].id == ab3100->chip_id) {
if (ids[i].name != NULL) { if (ids[i].name)
snprintf(&ab3100->chip_name[0],
sizeof(ab3100->chip_name) - 1,
"AB3100 %s",
ids[i].name);
break; break;
} else {
dev_err(&client->dev, dev_err(&client->dev, "AB3000 is not supported\n");
"AB3000 is not supported\n"); goto exit_no_detect;
goto exit_no_detect;
}
} }
} }
snprintf(&ab3100->chip_name[0],
sizeof(ab3100->chip_name) - 1, "AB3100 %s", ids[i].name);
if (ids[i].id == 0x0) { if (ids[i].id == 0x0) {
dev_err(&client->dev, "unknown analog baseband chip id: 0x%x\n", dev_err(&client->dev, "unknown analog baseband chip id: 0x%x\n",
ab3100->chip_id); ab3100->chip_id);
......
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