From patchwork Wed Aug 26 16:15:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11739109 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26D25138A for ; Wed, 26 Aug 2020 16:15:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F85622B40 for ; Wed, 26 Aug 2020 16:15:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598458556; bh=L3YrhCMnqGFLBGZtgx3mmLK0mDFYfcCW33WYEntFHMQ=; h=From:To:Subject:Date:List-ID:From; b=nM4DZlsm0C7uCffYtPL9KbkQvUEnRqKMM9q4tTfOxA782d6B+UtBAsNUu8gM+sXqK r71S8XQ2PBWW5LA2o6if+kwKOp8QUM5d0ZkVNTEGoV2jzx3CSjFH1CH36cOI29pAX6 9OiQleo3KDAHvpouXJm+5vlxdZiOtohLTOnM8AUc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726876AbgHZQPt (ORCPT ); Wed, 26 Aug 2020 12:15:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:47564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727997AbgHZQPq (ORCPT ); Wed, 26 Aug 2020 12:15:46 -0400 Received: from localhost.localdomain (unknown [194.230.155.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D3C9F2078A; Wed, 26 Aug 2020 16:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598458545; bh=L3YrhCMnqGFLBGZtgx3mmLK0mDFYfcCW33WYEntFHMQ=; h=From:To:Subject:Date:From; b=KeUfNLo4C4diCSCmgNZcQYopH5qAo3kfIzMNO/T+ax4uUxL/dQ5nNrkLoW5gYSOXQ eOWwuj0AvIDY7jBtixs057zqg1Q0UIXJvom+/aiYX9WlckrphIewq7IwPOm9j3Jsig IbXdmBBkt3RItB9vKmgxxBWR8iDCxDwnGP0AZvvI= From: Krzysztof Kozlowski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Peter Rosin , Alexandru Ardelean , Krzysztof Kozlowski , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] iio: magnetometer: mag3110: Simplify with dev_err_probe() Date: Wed, 26 Aug 2020 18:15:38 +0200 Message-Id: <20200826161539.20788-1-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value. Signed-off-by: Krzysztof Kozlowski --- drivers/iio/magnetometer/mag3110.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c index 4d305a21c379..838b13c8bb3d 100644 --- a/drivers/iio/magnetometer/mag3110.c +++ b/drivers/iio/magnetometer/mag3110.c @@ -476,22 +476,14 @@ static int mag3110_probe(struct i2c_client *client, data = iio_priv(indio_dev); data->vdd_reg = devm_regulator_get(&client->dev, "vdd"); - if (IS_ERR(data->vdd_reg)) { - if (PTR_ERR(data->vdd_reg) == -EPROBE_DEFER) - return -EPROBE_DEFER; - - dev_err(&client->dev, "failed to get VDD regulator!\n"); - return PTR_ERR(data->vdd_reg); - } + if (IS_ERR(data->vdd_reg)) + return dev_err_probe(&client->dev, PTR_ERR(data->vdd_reg), + "failed to get VDD regulator!\n"); data->vddio_reg = devm_regulator_get(&client->dev, "vddio"); - if (IS_ERR(data->vddio_reg)) { - if (PTR_ERR(data->vddio_reg) == -EPROBE_DEFER) - return -EPROBE_DEFER; - - dev_err(&client->dev, "failed to get VDDIO regulator!\n"); - return PTR_ERR(data->vddio_reg); - } + if (IS_ERR(data->vddio_reg)) + return dev_err_probe(&client->dev, PTR_ERR(data->vddio_reg), + "failed to get VDDIO regulator!\n"); ret = regulator_enable(data->vdd_reg); if (ret) { From patchwork Wed Aug 26 16:15:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11739111 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D787109B for ; Wed, 26 Aug 2020 16:16:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6536F2078A for ; Wed, 26 Aug 2020 16:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598458574; bh=muQ+YCp+Vwe8eKdaduBpNI5ws078auP+0FO7/EUefYM=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=HQxeslx4HW3S9U55jNkgi/J8jySFLZJs/m4kEYoyAMjkfwJRWOH3+a4BODOKGmBgd jqsrM4qXFqJCsShVSEuEDQS96TIV3ZjnorCUP2YP7mCB8EACL4lHtCD8b74GPc10Vc 6trvUZ8KQM/eFlJ/Hl/fhNoT3SIEstxk+U3jjm3I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728010AbgHZQQE (ORCPT ); Wed, 26 Aug 2020 12:16:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:47620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728000AbgHZQPs (ORCPT ); Wed, 26 Aug 2020 12:15:48 -0400 Received: from localhost.localdomain (unknown [194.230.155.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FB9D214F1; Wed, 26 Aug 2020 16:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598458548; bh=muQ+YCp+Vwe8eKdaduBpNI5ws078auP+0FO7/EUefYM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=2RMtokFwNX+WAsnxMSIH4661Ej5NnRs5/t5ku3/QNZkvTtV7G6l+UcH63HvPRXioB HHretdDcIXmsOV+c4hIsJnVcLwzzM9m9e1huKm8sl+T5wWE5oKTNl1XBFVqkeqV7mG TCpzcKFTSmFL0v1j2VcWCfDCYiwy2/Nzgk3K5Jps= From: Krzysztof Kozlowski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Peter Rosin , Alexandru Ardelean , Krzysztof Kozlowski , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] iio: magnetometer: iio-mux: Simplify with dev_err_probe() Date: Wed, 26 Aug 2020 18:15:39 +0200 Message-Id: <20200826161539.20788-2-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200826161539.20788-1-krzk@kernel.org> References: <20200826161539.20788-1-krzk@kernel.org> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value. Signed-off-by: Krzysztof Kozlowski --- drivers/iio/multiplexer/iio-mux.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/iio/multiplexer/iio-mux.c b/drivers/iio/multiplexer/iio-mux.c index 6910218fdb00..d219d4a86657 100644 --- a/drivers/iio/multiplexer/iio-mux.c +++ b/drivers/iio/multiplexer/iio-mux.c @@ -354,11 +354,8 @@ static int mux_probe(struct platform_device *pdev) return -ENODEV; parent = devm_iio_channel_get(dev, "parent"); - if (IS_ERR(parent)) { - if (PTR_ERR(parent) != -EPROBE_DEFER) - dev_err(dev, "failed to get parent channel\n"); - return PTR_ERR(parent); - } + if (IS_ERR(parent)) + return dev_err_probe(dev, PTR_ERR(parent), "failed to get parent channel\n"); sizeof_ext_info = iio_get_channel_ext_info_count(parent); if (sizeof_ext_info) {