From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872AbbL2TuY (ORCPT ); Tue, 29 Dec 2015 14:50:24 -0500 Received: from mout.web.de ([212.227.15.3]:59650 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753613AbbL2TuV (ORCPT ); Tue, 29 Dec 2015 14:50:21 -0500 Subject: [PATCH] mmc-core: One check less in mmc_select_hs200() after error detection References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall To: linux-mmc@vger.kernel.org, Ulf Hansson From: SF Markus Elfring Message-ID: <5682E3F9.4040006@users.sourceforge.net> Date: Tue, 29 Dec 2015 20:50:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:y8btNTGO09N0f0n22l7EfhgFMLFhkCz5Uqikmzp5IxQo+E3/lft ahthrQNCXhL61D0SiK/g0sGQdlCuGngr5Oc6va4euICjcWP9Bqwdj1zzM04BW3m2wK2+4jP y+Nz4b0Pw86MUGDuOJbIDAgVX7TP7X0rFg3M2GjZtCUfwndNWgJYfmj44I3T4MggjFgBcbM 8CYuFQW2BzWKQmV+L19RQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:cVoIBUU5Svk=:UhZi5nlGmPwiHBfXCiMHrm Fj/H2B9afhzSlZznTjQsSyOCq57IKha6l9ETqchEzwNJ42QYh7HgqnuilaEmafkOgQzB1ZSmQ dVGUzOkfc7Idx5kjSCVUefA7//y0fuoSCfw015RDZmSvjKuaBex63HYbD6uu5/Yww+2f8TZCg oX6uv+0yRyv19ShuOSoGcojACV+vj2ma5yRYSC4DQlCE6fcdp2JDg7swnvs2RVcC6kDzDz6qW Poj3GtLAwpJfOVzkJrXVDyHKsmK4eg9V+9Nq/0V0UcD7JrbhAW2h0xmn0sUnuIyzuvrbh2xhN mWAQBuUoYPJ7a478oQihToCS2uJDzW4855j7I4w5AkvIsiu29tgkXWRnU8DRnpfa34Ae/H7kW YaayC/akCHPnin2Gf8KLy/Q0+mx4ISHCpAGAu+OdWwHEtcyT9OkeqnGS5iT/FuKpqWNtHaXCi N22OUREhYLdA/QZLglm1z1CnFhxAASoNc/xjc1xXA7zUWMdLYaqz3VkvzTGXFuCKc8U/grvA+ hF4/c1pq3mxVJf5VekLT1h33jkLgyAr8ysdQTamR2oGthUmXC+ZkxrkGM3A+8W7Wk1wjETDDx rz0aO0xvljrGZzu4nglLLcNEn8+UvrKBrgkQ8vNPX9SU782E3S245IzgjTeO1yJUcWjrusWx4 0A7NzhWfQxztdEi5fgJYyBURIitpY+AChZ3+Vbw4qAf9zIZ9qTN1XVNNX2CHZsULjBkrNOM3w MZl/KEDWnSJ5mtvcBRnEJZlzDUas+Ht+qkhjX+ng5Kv4w9/VnbCY6ECRn8lbB7ieGI46739Z/ HcddjzE7XzAfvcrbXPOKSoz/tPAkg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 29 Dec 2015 20:28:46 +0100 This issue was detected by using the Coccinelle software. Move the jump label directly before the desired log statement so that the variable "err" will not be checked once more after it was determined that a call of the function "__mmc_set_signal_voltage" or "__mmc_switch" failed. Use the identifier "report_failure" instead of the label "err". Signed-off-by: Markus Elfring --- drivers/mmc/core/mmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 549c56e..866f72b 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1256,7 +1256,7 @@ static int mmc_select_hs200(struct mmc_card *card) /* If fails try again during next card power cycle */ if (err) - goto err; + goto report_failure; mmc_select_driver_type(card); @@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card) card->ext_csd.generic_cmd6_time, true, send_status, true); if (err) - goto err; + goto report_failure; old_timing = host->ios.timing; mmc_set_timing(host, MMC_TIMING_MMC_HS200); if (!send_status) { @@ -1289,10 +1289,11 @@ static int mmc_select_hs200(struct mmc_card *card) mmc_set_timing(host, old_timing); } } -err: - if (err) + if (err) { +report_failure: pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host), __func__, err); + } return err; } -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Tue, 29 Dec 2015 19:50:17 +0000 Subject: [PATCH] mmc-core: One check less in mmc_select_hs200() after error detection Message-Id: <5682E3F9.4040006@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Tue, 29 Dec 2015 20:28:46 +0100 This issue was detected by using the Coccinelle software. Move the jump label directly before the desired log statement so that the variable "err" will not be checked once more after it was determined that a call of the function "__mmc_set_signal_voltage" or "__mmc_switch" failed. Use the identifier "report_failure" instead of the label "err". Signed-off-by: Markus Elfring --- drivers/mmc/core/mmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 549c56e..866f72b 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1256,7 +1256,7 @@ static int mmc_select_hs200(struct mmc_card *card) /* If fails try again during next card power cycle */ if (err) - goto err; + goto report_failure; mmc_select_driver_type(card); @@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card) card->ext_csd.generic_cmd6_time, true, send_status, true); if (err) - goto err; + goto report_failure; old_timing = host->ios.timing; mmc_set_timing(host, MMC_TIMING_MMC_HS200); if (!send_status) { @@ -1289,10 +1289,11 @@ static int mmc_select_hs200(struct mmc_card *card) mmc_set_timing(host, old_timing); } } -err: - if (err) + if (err) { +report_failure: pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host), __func__, err); + } return err; } -- 2.6.3