From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750905AbdKSHGU (ORCPT ); Sun, 19 Nov 2017 02:06:20 -0500 Received: from mout.web.de ([212.227.15.4]:55849 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744AbdKSHGR (ORCPT ); Sun, 19 Nov 2017 02:06:17 -0500 To: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, Fabio Estevam , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] ASoC: wm8804: Use common error handling code in wm8804_probe() Message-ID: <0027af2f-e560-556c-e5af-effe5179a227@users.sourceforge.net> Date: Sun, 19 Nov 2017 08:04:28 +0100 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:WgKpJVUJF/2PpCPJ69oX0IPgk0UgNKDBLY4NJVLThlDK2W4nEZp UgU7ox1i2O5aWSMCp9DCKcHALGddvT4s9I49CX+G8nwQcYVk52dhiWgaZNoqu2iSV/Mk6J9 CeHc1nnUlux5AAC6W1qzxp20WVwUCd2p/QaplxwlFlRa1Rx0zkObI0Sb2nSuNms38CVMrQI vo9O01km7n7/16bSdSVDA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ULfycAGjdos=:PtqWOsRiPyjfQsEGra2DMI 2qU6m64kOEGDqRDu2kMQFh2NQM2lK/l81PIRjzarbUv1tBjuA3031DDvuu4PkrezXo9nNAi7y sD1asmwIB/C69J0hhxbA68QPtLun/HGtx5mORihwP+xxxakqX3nGHbcARKQUj/5lEhXcmCvfJ ByZIqNSQ+XrnrlylPUshT9le5T5FombOVes+3Zgz70aJ389wh3EetKL2DN7CPKAjYbpkRVILb +WXzIQOxf+vmPqypEORCkOuem9Z42HX+1lUYfkwUVbzfM9WFWg4ARbvnwkqkY1UtubejSA7tr 3I647IU1IfXTcjgTrURniXl4J2aUa6dVZDlMBi2wd6TadiGC2IHGE1heFe/tHf6Qmfj6fpn41 enziorQDmd9wy44/rkgFc32SCj3AZbfhmtjO591pJaL3luytVo/rNqlxCvWEzIBXqOFCIdX0Z 2YxbMV/M8eJnP1nPYRg2Nz39s46nxl1qzk6KoWvG2Dv0Ih0eh7i55XAkPegZttIlNkry3J0Ny dYSHslkDZfF2lW6s6WlEzOL4TyJYgkiZnvpx9hvFR9LWYLaTsARwpJdeaxo3Eb1MnmIIeRimJ 8zSs4dPg3RXyT5lARtDh4V4IN/t3aj6HtP/yUOkU3dA69Ln9HesOgU3tyD7PyrGFWaOLn7xAn 2AGfhf5+6Ag8I9fstr5K7VSs1YazA2TwjAp57UliCttkbSvsHnl2pvgPvcgNgVGLBr7JVpdeT 82vcpukJDLcnB7LPd79p/cp6BdWwohlLJIGpvJ0FMpfq6djZY8WqfG6PyeUZWcG73iheO8DLK Ld5XM4NvapJDq9Wm01/fg5gkBV1p+Sm6L1fXibMeNWPUtnhoJdm8yHQfLI4Dtmlr01aNy1U Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 19 Nov 2017 07:55:49 +0100 * Add a jump target so that a specific error message is stored only once at the end of this function implementation. * Replace two calls of the function "dev_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/soc/codecs/wm8804.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index fc69b87443d8..a45812417909 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -626,16 +626,12 @@ int wm8804_probe(struct device *dev, struct regmap *regmap) gpiod_set_value_cansleep(wm8804->reset, 1); ret = regmap_read(regmap, WM8804_RST_DEVID1, &id1); - if (ret < 0) { - dev_err(dev, "Failed to read device ID: %d\n", ret); - goto err_reg_enable; - } + if (ret < 0) + goto report_read_failure; ret = regmap_read(regmap, WM8804_DEVID2, &id2); - if (ret < 0) { - dev_err(dev, "Failed to read device ID: %d\n", ret); - goto err_reg_enable; - } + if (ret < 0) + goto report_read_failure; id2 = (id2 << 8) | id1; @@ -674,6 +670,8 @@ int wm8804_probe(struct device *dev, struct regmap *regmap) return 0; +report_read_failure: + dev_err(dev, "Failed to read device ID: %d\n", ret); err_reg_enable: regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies), wm8804->supplies); return ret; -- 2.15.0