lkml.org 
[lkml]   [2017]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/3] pinctrl: mcp23s08: Use common error handling code in mcp23s08_dbg_show()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Mon, 30 Oct 2017 16:26:09 +0100

    * The script "checkpatch.pl" pointed information out like the following.

    WARNING: Prefer seq_puts to seq_printf

    Thus fix the affected source code places.

    * Adjust jump targets so that a bit of exception handling can be better
    reused at the end of this function.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/pinctrl/pinctrl-mcp23s08.c | 34 +++++++++++++++++-----------------
    1 file changed, 17 insertions(+), 17 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
    index 919eb7268331..d1a7c627dbb9 100644
    --- a/drivers/pinctrl/pinctrl-mcp23s08.c
    +++ b/drivers/pinctrl/pinctrl-mcp23s08.c
    @@ -723,25 +723,20 @@ static void mcp23s08_dbg_show(struct seq_file *s, struct gpio_chip *chip)
    mutex_lock(&mcp->lock);

    t = __check_mcp23s08_reg_cache(mcp);
    - if (t) {
    - seq_printf(s, " I/O Error\n");
    - goto done;
    - }
    + if (t)
    + goto report_failure;
    +
    t = mcp_read(mcp, MCP_IODIR, &iodir);
    - if (t) {
    - seq_printf(s, " I/O Error\n");
    - goto done;
    - }
    + if (t)
    + goto report_failure;
    +
    t = mcp_read(mcp, MCP_GPIO, &gpio);
    - if (t) {
    - seq_printf(s, " I/O Error\n");
    - goto done;
    - }
    + if (t)
    + goto report_failure;
    +
    t = mcp_read(mcp, MCP_GPPU, &gppu);
    - if (t) {
    - seq_printf(s, " I/O Error\n");
    - goto done;
    - }
    + if (t)
    + goto report_failure;

    for (t = 0, mask = BIT(0); t < chip->ngpio; t++, mask <<= 1) {
    const char *label;
    @@ -758,8 +753,13 @@ static void mcp23s08_dbg_show(struct seq_file *s, struct gpio_chip *chip)
    /* NOTE: ignoring the irq-related registers */
    seq_puts(s, "\n");
    }
    -done:
    +unlock:
    mutex_unlock(&mcp->lock);
    + return;
    +
    +report_failure:
    + seq_puts(s, " I/O Error\n");
    + goto unlock;
    }

    #else
    --
    2.14.3
    \
     
     \ /
      Last update: 2017-10-30 16:48    [W:5.124 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site