Skip to content

Commit

Permalink
mfd: ab8500-debugfs: Use common error handling code in ab8500_print_m…
Browse files Browse the repository at this point in the history
…odem_registers()

Add jump targets so that two error messages are stored only once
at the end of this function implementation.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Markus Elfring authored and Lee Jones committed Jan 8, 2018
1 parent e368866 commit 0a5d79b
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions drivers/mfd/ab8500-debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1620,18 +1620,15 @@ static int ab8500_print_modem_registers(struct seq_file *s, void *p)

err = abx500_get_register_interruptible(dev,
AB8500_REGU_CTRL1, AB8500_SUPPLY_CONTROL_REG, &orig_value);
if (err < 0) {
dev_err(dev, "ab->read fail %d\n", err);
return err;
}
if (err < 0)
goto report_read_failure;

/* Config 1 will allow APE side to read SIM registers */
err = abx500_set_register_interruptible(dev,
AB8500_REGU_CTRL1, AB8500_SUPPLY_CONTROL_REG,
AB8500_SUPPLY_CONTROL_CONFIG_1);
if (err < 0) {
dev_err(dev, "ab->write fail %d\n", err);
return err;
}
if (err < 0)
goto report_write_failure;

seq_printf(s, " bank 0x%02X:\n", bank);

Expand All @@ -1641,19 +1638,25 @@ static int ab8500_print_modem_registers(struct seq_file *s, void *p)
for (reg = AB8500_FIRST_SIM_REG; reg <= last_sim_reg; reg++) {
err = abx500_get_register_interruptible(dev,
bank, reg, &value);
if (err < 0) {
dev_err(dev, "ab->read fail %d\n", err);
return err;
}
if (err < 0)
goto report_read_failure;

seq_printf(s, " [0x%02X/0x%02X]: 0x%02X\n", bank, reg, value);
}
err = abx500_set_register_interruptible(dev,
AB8500_REGU_CTRL1, AB8500_SUPPLY_CONTROL_REG, orig_value);
if (err < 0) {
dev_err(dev, "ab->write fail %d\n", err);
return err;
}
if (err < 0)
goto report_write_failure;

return 0;

report_read_failure:
dev_err(dev, "ab->read fail %d\n", err);
return err;

report_write_failure:
dev_err(dev, "ab->write fail %d\n", err);
return err;
}

static int ab8500_modem_open(struct inode *inode, struct file *file)
Expand Down

0 comments on commit 0a5d79b

Please sign in to comment.