From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932394AbdJ3PsB (ORCPT ); Mon, 30 Oct 2017 11:48:01 -0400 Received: from mout.web.de ([212.227.17.11]:62563 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932156AbdJ3Pr6 (ORCPT ); Mon, 30 Oct 2017 11:47:58 -0400 Subject: [PATCH 2/3] pinctrl: mcp23s08: Use common error handling code in mcp23s08_dbg_show() From: SF Markus Elfring To: linux-gpio@vger.kernel.org, Linus Walleij , Sebastian Reichel Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <3e95d8b5-8306-ae4c-487b-44c6dc1811d6@users.sourceforge.net> Date: Mon, 30 Oct 2017 16:47:55 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:VYbD9258Lr2PoGbEd8wVPbZyhKsxZYO1l3e7UCC+BqlruhjDwUU v0tyjNlVN4ydWeljIdIPev8KqkuGZeYkjEpUwMVhDU6X0YIKRfHUFCiKcpqwTSR2SxfJ89H XmzvyNk4dw6VQ9XpF8LhxQTAeKCs2HbwhW7ZnIiY6ysAeRHW8FCBxTnjttynkVPiuBvqNIG yuNWFhcxO+zkz5zi7fumQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:EKhboaGw7UY=:YrInCibtsdvlzhDeLtNGUG w9vmMme7kaGvLaXYZnkXKpBzeCU/DhBrYHBShdatD7IAycYvkI2NYYjLVOyHARz95zsSBqkU1 AOhtyfCiyaQ0SuaEThGBAx3ct7K5SuCJrcJT6CMGP6RSFPcLVGUtY/BNNyozWW2kxvxnxXwTD Fd8/WhzjkATzOyMseKqnkzFUp5S6elTyMjhwOkkovR5ByuWVWxU/GdzF4rBhAoTHo2TqVy5fC L57avlNffVcvlATV3cNrlsjZNGtyoGqKB8jdxyH1P7wVR8zSnf3roQ0FJtFtW0mk45MTILg73 mrYYkebs3GDu42RteruLNpRiva5VHMyifbwHQU8A2GFbd+O05qW9GhvpKpgvyNfpQqhL53Gcf /J2nK09XmPn+bUcSu+Wd7LuqRnlW7pOuUayR8hJQvf1n2jYBGuQ5Ts8UF/dMYRiZWwLxcHGnf QzGJYUxDKV/IrPgx4j8AzQBXVZZnjLu3zvm7CDHNNuc6hhFFLzdemPr9Ne+4b1Qr3cny8PrmN fHuk3gc2kDkvDEY00en040DuJK3UKUE+KInVWZNAUEO7z9b/c60gvSiN3GIb8LTtUFyMmlSF9 1CtqSkk8gmTUu/NVFq+HT822aRfpI/Hv/wPTx2YHq/3zgq4CiM1jVfEgwAnOFRnVGOB+tZOwu MLSD1PZow3QAbCXotWtLZeW+TvMiY8rCuCvFAMGy/ozb17mJqlJRl5lhpRhmFS7aZT0kpTyZA cYITowqgacQkUUOiPy4z7yl3JEGwqPiU6ONr4pYqMXeTYc0MouciI9Lr2datIsVxOSJO/Ygcg W5QAwJoXSdHHXHUO7dqGpyXJlNouSITBWiVUOjU5CDjUBO96mI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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