From patchwork Wed Oct 25 11:40:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 830240 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yMSsY3WqBz9sRV for ; Wed, 25 Oct 2017 22:41:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750852AbdJYLli (ORCPT ); Wed, 25 Oct 2017 07:41:38 -0400 Received: from mout.web.de ([212.227.15.4]:63706 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747AbdJYLlh (ORCPT ); Wed, 25 Oct 2017 07:41:37 -0400 Received: from [192.168.1.2] ([77.181.217.114]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MJ1Nh-1e9n1f2cdF-002Txn; Wed, 25 Oct 2017 13:40:58 +0200 To: linux-i2c@vger.kernel.org, Jean Delvare , Wolfram Sang Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] I2C-PIIX4: Use common error handling code in piix4_probe() Message-ID: Date: Wed, 25 Oct 2017 13:40:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:0RUyJZLsMjr28gHz3wla117MyAW7cgUFT7K403S48PdVNx/gDzH mXqq33IC3R1z4/XPin0YxVhvnnLveE6CTyZJRTsLpZdDwaKm4ELDd1/R9fAGgMOUOlu/eRI 2Dlm2vuzMPycEVSmvOqPI5y9lZ4NWbvnN07p+yJUMYQfUMqKopTN3+kzl5zYwMHp/Hx5SIV QOT8o4prCSIYATfXSwwBA== X-UI-Out-Filterresults: notjunk:1; V01:K0:fGd8cwh5kbU=:yOFaSPZo5xvRiPIXleYaay X+Qmfhx5rCR1hmNGgAE+4R4clquazmnxX+cq05vev+dcXzVDfIaOXPxY8x5FD8DGuenmssmIL X5whdbj9aPrRvlnZbv2uNQIg+RJdGD3yh/cAu08DL/7WFFpIqdU39QtkFsbzAACtgT5vDsL2y B2roxVvuI9Ln9Z85ZWwuSXcnpsNTJZrC6McHcdcwFGfAuOZey6MPAm2fP03bRfwLz75gMQ8kp MVue1tgeKJZSbb84IMSlF09qvoqk8l9zAm0DyOuHFvYJ2nrbVuGFqce9f/hAjt/m5tdYQcXrP dB+5jw4zxtQPtkhdj30JMmtaxc1i5sfACsVJZT7BK8Yty7c5SQPwIl66eALuCFfavqp9I1YQ4 8u1NvmlI0UOzBNL3lp1Tp1V6dzW21rSbY/xpqAisy9i0ALo7jucQykAGpfH4RgxSWk9dgIftt jn/R67e0h8hQC+quZ9svS/lnQTu8vjdbgYE9WHUeiPnRVJyrwXulAtK3F1T8oY9e8qSRAtqRD +Y61uP6L4w4UVP76aRHiLSfXPwqYVj05xFo3mFKajyJlzhxozJ2yDPd6U8WXH2BKf55E/ClNL Acfy92RqWPMvygSsjJnOo90ZO+daTDxwDb0sFSTccikaNVn5aZXN4Km+8hzY5lAnY61OspYBN 1exzLex0+txnwHoAIOjSGefK5Irq/qd49d5Wl65v2r0j4CdTmsZTwvRPwWueXQg9WQvic+YvD VtVxcdkipozhXZ8AkgBiMrb57qbKRXVm1ZmHFU/zYjAkFFGQAiJt0pDU+tqPva/cu9IHZ1a6x wgGu+wpZUFa72YLT9HYofazJl88mC+DIWh/sgs8ASVp1H6E4og= Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Markus Elfring Date: Wed, 25 Oct 2017 13:30:18 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/i2c/busses/i2c-piix4.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 0ecdb47a23ab..22cc56e9f304 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -780,20 +780,16 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) /* base address location etc changed in SB800 */ retval = piix4_setup_sb800(dev, id, 0); - if (retval < 0) { - release_region(SB800_PIIX4_SMB_IDX, 2); - return retval; - } + if (retval < 0) + goto release_region; /* * Try to register multiplexed main SMBus adapter, * give up if we can't */ retval = piix4_add_adapters_sb800(dev, retval); - if (retval < 0) { - release_region(SB800_PIIX4_SMB_IDX, 2); - return retval; - } + if (retval < 0) + goto release_region; } else { retval = piix4_setup(dev, id); if (retval < 0) @@ -833,6 +829,10 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) } return 0; + +release_region: + release_region(SB800_PIIX4_SMB_IDX, 2); + return retval; } static void piix4_adap_remove(struct i2c_adapter *adap)