From patchwork Sun Jun 11 14:03:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 106104 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2083757vqr; Sun, 11 Jun 2023 08:09:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ij22S9u9HoPrMG65Yav9fOTOmX2nGVVVWlbHyCyg4SLF5lV6l5S/OSGrwJF1NHVlFE32k X-Received: by 2002:a17:902:d583:b0:1b3:89e9:d7ae with SMTP id k3-20020a170902d58300b001b389e9d7aemr4761214plh.66.1686496150255; Sun, 11 Jun 2023 08:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686496150; cv=none; d=google.com; s=arc-20160816; b=FVjUMGpIYyD0ENR1/KqeZz9lkM3Lp9PJjwT8rIzkX10XQt8RRvwFSwCAAmDSfgzWaO 61LLTHq5WwZryNNvq674uH6JmxQVZ6MlchhZRFyJFkF24Mpp5lXpMa6g715dN/xfWOiS NUcEorBuzPk4fpyI1jjv7a7lYil4Fp+DlM5VNKQkLWskgoUNoSc9ULkKjdtBrFOL0KHD /R5qY1r+Nmq7GajSKtg8AqZq0Ehc9h4s3xW1duV8/bCwNx463CK2ivxePjndObO+NlXx cAAqczVxET/eGib3KwIkTkLroMqLJmIYm4XQr2GI8JX0tUMZzhPlyLSCghCCQ2ORJLS7 LnNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Aoy/xzTFMDxWBDKIvAVVntbDDOtT71yup8EagJsGpIA=; b=lsr0ULATNhnBfRu3SH9R0smbjjv9+Mhot6j6qlLSmTlhLTvTHBAluisSM4JoIHULBI qLiEj5KwY0JXrFn2wjk8XjcrwJgdOuRV+oTywmuA3Thrlw+wEVaJOy7+L2NLhAa+W2Xy f5EyobTIv5WO3QtVf1oXoO0ykBa7nXZoMecEaUfGlukA1pqeE6Q5tXDUYqYgLlaBWHeO B2kxIS+vpTsZyHnqC/pmQQTNVRkKEYpI04ESHGH52q6EBnwBT063IQghOSkm0B0vntbO QBGEZB3wz5VX7e3gLaWSkRYcHG1DuGVeb3iasDqjw5S83K9k0oeBkt9Fsvy9LXrbH9ye 7sOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i5dVRXou; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds23-20020a17090b08d700b0024df2dbc7afsi2352188pjb.52.2023.06.11.08.08.57; Sun, 11 Jun 2023 08:09:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i5dVRXou; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233975AbjFKOFH (ORCPT + 99 others); Sun, 11 Jun 2023 10:05:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233563AbjFKOEa (ORCPT ); Sun, 11 Jun 2023 10:04:30 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6AE11BE4 for ; Sun, 11 Jun 2023 07:04:01 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f6da07feb2so34523535e9.0 for ; Sun, 11 Jun 2023 07:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686492240; x=1689084240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aoy/xzTFMDxWBDKIvAVVntbDDOtT71yup8EagJsGpIA=; b=i5dVRXoue9OVf98cjFJwqsGRZDcEoPRmw8E1oGwUZsdSi9OkR/0fR+Sj/dY0RGS/ZV O3po9+volhPJVXc7veSWl3HKyffsrKIvtILn6BLPvAW73NpKbKCuOMeAAPOUQ+/yn9RD xnjQnQeIKxuGBeSwzS8NjaVfMSTDyg7FAW15N6R9NWJ6GPMq0JxJjxbI+tptp7Ho6/37 wlGCHhGDl316mQem978bCahnucjHYOrPmVbQlPlAtxpbXo8izDCvd8Gubnv/gA5F1nV3 zX5VS5QQtPv1jERplLnB3e525haYUdMAcfBmcq7UKRN+tJwUizPBHgC/FbRVOgUwvvUK /xCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686492240; x=1689084240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Aoy/xzTFMDxWBDKIvAVVntbDDOtT71yup8EagJsGpIA=; b=SMu+84ijeJS84F8qsL0oU1uak9C2Vi9/OKOhb19Sv0Gnah/ScUJULV9+nLQXjKfbnt O6c54vSQthI5iwh9+zrPoF6naT8ecSMyKUpnEjALk/SREYb66sPV2PoWGnCBG8L8UO6z M1gDg576twn4MXidcBAUexiREFzrlz4NfAASBsoBfAwqQdFgaDjJAA0IFZYxVTdG+i/t XiOnAnEW0LA2olV0/cOtrC+M668ttsvRYHQROIjeDAFYzjMB208OYYxsOpG3/nf5YGsW Ujtv+ExcaZwsJff+D3KcLqX+F7/M8aDIXT6v9nWPhq2qH1JOF3E51FyKbD8Ozn7x2CkN 8Oog== X-Gm-Message-State: AC+VfDzCCSg+jisr8NyAmOddW0Qm7DxmSfMBeuTqUVR6RGqtN04g/KKC 5c2vSzMKmWUNFeK81nw0YOPLgg== X-Received: by 2002:a7b:ce07:0:b0:3f7:f584:5791 with SMTP id m7-20020a7bce07000000b003f7f5845791mr5425980wmc.35.1686492240110; Sun, 11 Jun 2023 07:04:00 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id h17-20020a05600c28d100b003f080b2f9f4sm8567222wmd.27.2023.06.11.07.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 07:03:58 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Cristian Ciocaltea , Vincent Legoll , Heiko Stuebner , Srinivas Kandagatla Subject: [PATCH 12/26] nvmem: rockchip-otp: Improve probe error handling Date: Sun, 11 Jun 2023 15:03:16 +0100 Message-Id: <20230611140330.154222-13-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230611140330.154222-1-srinivas.kandagatla@linaro.org> References: <20230611140330.154222-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768419387204718628?= X-GMAIL-MSGID: =?utf-8?q?1768419387204718628?= From: Cristian Ciocaltea Enhance error handling in the probe function by making use of dev_err_probe(), which ensures the error code is always printed, in addition to the specified error message. Signed-off-by: Cristian Ciocaltea Tested-by: Vincent Legoll Reviewed-by: Heiko Stuebner Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/rockchip-otp.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/nvmem/rockchip-otp.c b/drivers/nvmem/rockchip-otp.c index 439aea1f8874..84bf956cc4e1 100644 --- a/drivers/nvmem/rockchip-otp.c +++ b/drivers/nvmem/rockchip-otp.c @@ -235,10 +235,8 @@ static int rockchip_otp_probe(struct platform_device *pdev) int ret, i; data = of_device_get_match_data(dev); - if (!data) { - dev_err(dev, "failed to get match data\n"); - return -EINVAL; - } + if (!data) + return dev_err_probe(dev, -EINVAL, "failed to get match data\n"); otp = devm_kzalloc(&pdev->dev, sizeof(struct rockchip_otp), GFP_KERNEL); @@ -249,7 +247,8 @@ static int rockchip_otp_probe(struct platform_device *pdev) otp->dev = dev; otp->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(otp->base)) - return PTR_ERR(otp->base); + return dev_err_probe(dev, PTR_ERR(otp->base), + "failed to ioremap resource\n"); otp->clks = devm_kcalloc(dev, data->num_clks, sizeof(*otp->clks), GFP_KERNEL); @@ -261,18 +260,22 @@ static int rockchip_otp_probe(struct platform_device *pdev) ret = devm_clk_bulk_get(dev, data->num_clks, otp->clks); if (ret) - return ret; + return dev_err_probe(dev, ret, "failed to get clocks\n"); otp->rst = devm_reset_control_array_get_exclusive(dev); if (IS_ERR(otp->rst)) - return PTR_ERR(otp->rst); + return dev_err_probe(dev, PTR_ERR(otp->rst), + "failed to get resets\n"); otp_config.size = data->size; otp_config.priv = otp; otp_config.dev = dev; - nvmem = devm_nvmem_register(dev, &otp_config); - return PTR_ERR_OR_ZERO(nvmem); + nvmem = devm_nvmem_register(dev, &otp_config); + if (IS_ERR(nvmem)) + return dev_err_probe(dev, PTR_ERR(nvmem), + "failed to register nvmem device\n"); + return 0; } static struct platform_driver rockchip_otp_driver = {