From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932342AbdJ0RRe (ORCPT ); Fri, 27 Oct 2017 13:17:34 -0400 Received: from mout.web.de ([217.72.192.78]:62650 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751561AbdJ0RR3 (ORCPT ); Fri, 27 Oct 2017 13:17:29 -0400 To: linux-mmc@vger.kernel.org, Ulf Hansson , Wolfram Sang Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] mmc: tmio: Use common error handling code in tmio_mmc_host_probe() Message-ID: <7fdea92c-2ca7-8911-28da-4388103e1b04@users.sourceforge.net> Date: Fri, 27 Oct 2017 19:17:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:p3sL5pM9GQhsKdpzj59Axd6W/Sg1W18HD/Cy0FLIIy3NEWFtJ4j hoT6vJ2YfJRk2oGfAflLFy30d8bxS1+8vynWyror+sAXx2MuphqmjZa2EgSP1Gf+VL0sGc4 gOHJEhboMzaWdPtR1pl1kvdxjIzKz062CmZKh2SHKanCwlK1TsBjOtsJJT5671AK2fRU2ui 3AJa8lj2ceKvVCPqZB3hg== X-UI-Out-Filterresults: notjunk:1;V01:K0:dvnnzE6rZ74=:OoUHeIvIseo7nu0WLaoX1T r3q502QmpZUcXzFzcZLQbOZNc7phY3FQnGi+0EfkeUptSjAtkGVMAsUhldLbVaC68qRWuJZBN I4NzmsCuuwRuTYmItCJdsh6BLDQzfTD/+8jU0AZPyddYCGF8jsuWrcTn5uVlEKz4hB6mcbBDw 7SxazB5YVsuOf7iyFWcieAHBrHgZn28RDNtFCk1l9cgND4T8YgfI1XyOWiM7mQ0cY2/pHpqFL /bF1OC4wu9Q9vx6jH9mWUuNsk9Wu7Ef3YZhnamLXZn/UeUMIiteTy1WLvgPyc0KzDhY6OtltL rvnFz13/FGd9rdP0BukLSk6DVobtsFRc3RNaYAPdqvNO7jDpiGEFZ+AAOXts0fdlq8KczE+yn e6mtjnGw93AWE2HYX9A3dHbX9gXCLYqgDsbtDunDL0mw8VlE2ljLhqga3boYFBqLuSVqny4Ya OWlc3ggTUvnZc9lENBzleQODqrzsWzt/ZbXp3/2yODgKup58Ux/o0s/ThfsvFK+JG72PZSVNU jWVGh0o8hgSq+6BdKWzRVdxu3Jr+TQs8gItiBP2YrkKihItxX/vUlP8WmLqPIoQBy0NyEndkI beJwjtZwkllGuGn8bV+QdcPSFVpW9Ky2PFPM5XfU2cnEyT3/V3+El1yV+gTnpaMSg2LInbh3s YPbpVHTHCurOqJMlIhOaCHp9dR/g6yWsNgH9CIS426zD+3XF8kI69TXfM/MIMvWqalrm0soeV mh0+Vkv4S04KALbhfn6/C0dllVSa5YBIzEIt/lpSH7w3lbkT1u4Kc5RQP9FvG7rwwVwIdHboX mZoTsGI4Ie213t85C7mZaSxcPC8A/vVPoD3KqdJdNVOTKJ3RPM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 27 Oct 2017 19:09:17 +0200 * Add a jump target so that a bit of exception handling can be better reused at the end of this function. * Adjust condition checks. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/mmc/host/tmio_mmc_core.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index a7293e186e03..2e85d4048cec 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1286,23 +1286,24 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, pm_runtime_enable(&pdev->dev); ret = mmc_add_host(mmc); - if (ret < 0) { - tmio_mmc_host_remove(_host); - return ret; - } + if (ret) + goto remove_host; dev_pm_qos_expose_latency_limit(&pdev->dev, 100); if (pdata->flags & TMIO_MMC_USE_GPIO_CD) { ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio, 0); - if (ret < 0) { - tmio_mmc_host_remove(_host); - return ret; - } + if (ret) + goto remove_host; + mmc_gpiod_request_cd_irq(mmc); } return 0; + +remove_host: + tmio_mmc_host_remove(_host); + return ret; } EXPORT_SYMBOL_GPL(tmio_mmc_host_probe); -- 2.14.3