From nobody Fri Sep 20 11:30:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25A6FC7113B for ; Thu, 24 Aug 2023 10:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240770AbjHXKmD (ORCPT ); Thu, 24 Aug 2023 06:42:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240705AbjHXKl4 (ORCPT ); Thu, 24 Aug 2023 06:41:56 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7DB319A2 for ; Thu, 24 Aug 2023 03:41:54 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1bda9207132so52473415ad.0 for ; Thu, 24 Aug 2023 03:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1692873714; x=1693478514; 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=LEJf1Ko1BMCyWS/D/rsWBp+WuGpyKGTRzMpr52lamRc=; b=oaZO0U9EnOZE/Os+8hmlmogE4YwN515J72FCRMHS0mo31BHgkDUfNVslhtRyvz2atI shXHfduCWhdeyg1WmMDN3GzTmCG3gc52LI5GIU/tRzvvRW9AdZ2FI87Phb2icityItBZ LyCOsvzyLqM0ivkRo4XPSXJCLzdyOURzpKDls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692873714; x=1693478514; 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=LEJf1Ko1BMCyWS/D/rsWBp+WuGpyKGTRzMpr52lamRc=; b=dhglW5Lb0uXHMQoFZ3ENNbOk0JeCHQFMrKNDFCugb5xvxf4+PLaD9SZbIBv+q5IbK+ 16tX2sJa40io0gBQcYhJyniwn3WY5HeJsDGNT5Av/XRwt3R6XHoQKA36dy9M+CcrJYTz 4eMYLg28pTZf+NEYBvdfQkDPYFh25Y9vOCOE0pR4Hp0xAzX47AtdQwTlYs3q9LngdUDn eBwnC72hqWNYvxhYxEbuKefvvy2ttlbn1gs9DMUArx02pP9oaK/xyiizXDMxwrK44eq9 Vpds40HgvcqMR4y78MNMVFmyUHyf93eA51zywWmHB4LI8Izd7Po5Fr+nb7p5Xn0oefK5 BZBw== X-Gm-Message-State: AOJu0Ywp84j4ZMuFW/cYzTcu1+nsuK0hDlzKSOFy1+TVWp6aMzs5/G1j TzVHn03an117PscA5B81YAlnjQ== X-Google-Smtp-Source: AGHT+IF+kf7WstGJzoE6CoHxmnzcwn+x6Is3sSPEaLcz4wnfFtA6FShvnq99VJEDPmziWkv/tJ0woQ== X-Received: by 2002:a17:902:da88:b0:1bc:203f:3b3c with SMTP id j8-20020a170902da8800b001bc203f3b3cmr17586042plx.24.1692873714369; Thu, 24 Aug 2023 03:41:54 -0700 (PDT) Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:ed6d:42e3:a23:8316]) by smtp.gmail.com with ESMTPSA id q2-20020a170902dac200b001b5247cac3dsm12524645plx.110.2023.08.24.03.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 03:41:54 -0700 (PDT) From: Fei Shao To: Stephen Boyd , Chen-Yu Tsai Cc: linux-mediatek@lists.infradead.org, Fei Shao , linux-kernel@vger.kernel.org Subject: [PATCH 1/5] spmi: Introduce device-managed functions Date: Thu, 24 Aug 2023 18:40:08 +0800 Message-ID: <20230824104101.4083400-2-fshao@chromium.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230824104101.4083400-1-fshao@chromium.org> References: <20230824104101.4083400-1-fshao@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Utilize the managed resource (devres) framework and add the following devm_* helpers for the SPMI driver: - devm_spmi_controller_alloc() - devm_spmi_controller_add() Signed-off-by: Fei Shao Reviewed-by: AngeloGioacchino Del Regno --- drivers/spmi/Makefile | 2 +- drivers/spmi/devres.c | 61 +++++++++++++++++++++++++++++++++++++++++++ include/linux/spmi.h | 3 +++ 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 drivers/spmi/devres.c diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile index 9d974424c8c1..02d917f4df34 100644 --- a/drivers/spmi/Makefile +++ b/drivers/spmi/Makefile @@ -2,7 +2,7 @@ # # Makefile for kernel SPMI framework. # -obj-$(CONFIG_SPMI) +=3D spmi.o +obj-$(CONFIG_SPMI) +=3D spmi.o devres.o =20 obj-$(CONFIG_SPMI_HISI3670) +=3D hisi-spmi-controller.o obj-$(CONFIG_SPMI_MSM_PMIC_ARB) +=3D spmi-pmic-arb.o diff --git a/drivers/spmi/devres.c b/drivers/spmi/devres.c new file mode 100644 index 000000000000..f18cbbe28812 --- /dev/null +++ b/drivers/spmi/devres.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2023 Google LLC. + */ + +#include +#include + +static void devm_spmi_controller_release(struct device *parent, void *res) +{ + spmi_controller_put(*(struct spmi_controller **)res); +} + +struct spmi_controller *devm_spmi_controller_alloc(struct device *parent, = size_t size) +{ + struct spmi_controller **ptr, *ctrl; + + ptr =3D devres_alloc(devm_spmi_controller_release, sizeof(*ptr), GFP_KERN= EL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + ctrl =3D spmi_controller_alloc(parent, size); + if (!ctrl) { + devres_free(ptr); + return ERR_PTR(-ENOMEM); + } + + *ptr =3D ctrl; + devres_add(parent, ptr); + + return ctrl; +} +EXPORT_SYMBOL_GPL(devm_spmi_controller_alloc); + +static void devm_spmi_controller_remove(struct device *parent, void *res) +{ + spmi_controller_remove(*(struct spmi_controller **)res); +} + +int devm_spmi_controller_add(struct device *parent, struct spmi_controller= *ctrl) +{ + struct spmi_controller **ptr; + int ret; + + ptr =3D devres_alloc(devm_spmi_controller_remove, sizeof(*ptr), GFP_KERNE= L); + if (!ptr) + return -ENOMEM; + + ret =3D spmi_controller_add(ctrl); + if (ret) { + devres_free(ptr); + return ret; + } + + *ptr =3D ctrl; + devres_add(parent, ptr); + + return 0; + +} +EXPORT_SYMBOL_GPL(devm_spmi_controller_add); diff --git a/include/linux/spmi.h b/include/linux/spmi.h index eac1956a8727..14597708fdbc 100644 --- a/include/linux/spmi.h +++ b/include/linux/spmi.h @@ -120,6 +120,9 @@ static inline void spmi_controller_put(struct spmi_cont= roller *ctrl) int spmi_controller_add(struct spmi_controller *ctrl); void spmi_controller_remove(struct spmi_controller *ctrl); =20 +struct spmi_controller *devm_spmi_controller_alloc(struct device *parent, = size_t size); +int devm_spmi_controller_add(struct device *parent, struct spmi_controller= *ctrl); + /** * struct spmi_driver - SPMI slave device driver * @driver: SPMI device drivers should initialize name and owner field of --=20 2.42.0.rc1.204.g551eb34607-goog From nobody Fri Sep 20 11:30:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37439C7EE43 for ; Thu, 24 Aug 2023 10:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240808AbjHXKmE (ORCPT ); Thu, 24 Aug 2023 06:42:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240733AbjHXKl7 (ORCPT ); Thu, 24 Aug 2023 06:41:59 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 852D319A2 for ; Thu, 24 Aug 2023 03:41:57 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1bf48546ccfso37363675ad.2 for ; Thu, 24 Aug 2023 03:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1692873717; x=1693478517; 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=a7ehnQUGg3AKORpAuWZQKuhgBidrmQAa7Q4v6MvPOrg=; b=GGkazUlFNAPtpUy021BsGhwjV4kl0TZaOHnxO5hTMMZ7jN4oxl/ZGX63JCXaCN3kRI wqujm3hGuqh7Pv17N2fF7meF3cBy8afMW/3OTTCiSQ1LCkwQ9Xgwd5vqoK2MbZNC9ipN 3zymGy8wrhUon01M1eAueKxCbnxFh+xguSlWY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692873717; x=1693478517; 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=a7ehnQUGg3AKORpAuWZQKuhgBidrmQAa7Q4v6MvPOrg=; b=AhMCnvWqHFIXLW7tVcZa6nuE0aZ/YrKG2LVCAQ9czEEeMYvyHZoogl/MRdlZNZxJZk f76Ne5hej9Ktlwppb8L1V4dXwRVnCmBWn4SHrqzzW1KDUKK70/YfEfkAvgW/rNveE52X oSIoYZ2m8aAUn6YsAGH3/QRgJNevCkCNTGgdHOmFyOSuAtqlaFxu+vlxAyO+NWjmtTyZ LyXddNCmICPCkUvR487Q0BAZ1nlRvAWDyiwb/j7YUpZsknNP/FKZ2XD7IJuEeuof8kz3 iwfAP5wnmiZTkxlRxLivozc5bnn2jf6IX1gql/Jxd+aGMovbL0lz5j8yxoTro697dcaK TKAg== X-Gm-Message-State: AOJu0YwqHPJh22nRZ7AkHGAS3GCCxd/kNRh/5+hHUnOjHT38kYLBE3u7 COmxq2tJFDneuhOfGdVnkDWKWw== X-Google-Smtp-Source: AGHT+IHVMrdwEtZBx83tpEboYUtEK7EO5abihTGfCj+KqNS/3F8eD0JIrOXuuysFoORhdmvs9PS0PA== X-Received: by 2002:a17:902:d511:b0:1bc:5e50:9345 with SMTP id b17-20020a170902d51100b001bc5e509345mr14923808plg.50.1692873717041; Thu, 24 Aug 2023 03:41:57 -0700 (PDT) Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:ed6d:42e3:a23:8316]) by smtp.gmail.com with ESMTPSA id q2-20020a170902dac200b001b5247cac3dsm12524645plx.110.2023.08.24.03.41.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 03:41:56 -0700 (PDT) From: Fei Shao To: Stephen Boyd , Chen-Yu Tsai Cc: linux-mediatek@lists.infradead.org, Fei Shao , AngeloGioacchino Del Regno , Matthias Brugger , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] spmi: Use devm_spmi_controller_alloc() Date: Thu, 24 Aug 2023 18:40:09 +0800 Message-ID: <20230824104101.4083400-3-fshao@chromium.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230824104101.4083400-1-fshao@chromium.org> References: <20230824104101.4083400-1-fshao@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert to the device-managed version of spmi_controller_alloc() and simplify the excess error handling code. Signed-off-by: Fei Shao Reviewed-by: AngeloGioacchino Del Regno --- drivers/spmi/hisi-spmi-controller.c | 22 +++----- drivers/spmi/spmi-mtk-pmif.c | 26 +++------ drivers/spmi/spmi-pmic-arb.c | 87 ++++++++++------------------- 3 files changed, 46 insertions(+), 89 deletions(-) diff --git a/drivers/spmi/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-c= ontroller.c index 9cbd473487cb..a5525902656a 100644 --- a/drivers/spmi/hisi-spmi-controller.c +++ b/drivers/spmi/hisi-spmi-controller.c @@ -267,10 +267,10 @@ static int spmi_controller_probe(struct platform_devi= ce *pdev) struct resource *iores; int ret; =20 - ctrl =3D spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); - if (!ctrl) { + ctrl =3D devm_spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); + if (IS_ERR(ctrl)) { dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); - return -ENOMEM; + return PTR_ERR(ctrl); } spmi_controller =3D spmi_controller_get_drvdata(ctrl); spmi_controller->controller =3D ctrl; @@ -278,24 +278,21 @@ static int spmi_controller_probe(struct platform_devi= ce *pdev) iores =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!iores) { dev_err(&pdev->dev, "can not get resource!\n"); - ret =3D -EINVAL; - goto err_put_controller; + return -EINVAL; } =20 spmi_controller->base =3D devm_ioremap(&pdev->dev, iores->start, resource_size(iores)); if (!spmi_controller->base) { dev_err(&pdev->dev, "can not remap base addr!\n"); - ret =3D -EADDRNOTAVAIL; - goto err_put_controller; + return -EADDRNOTAVAIL; } =20 ret =3D of_property_read_u32(pdev->dev.of_node, "hisilicon,spmi-channel", &spmi_controller->channel); if (ret) { dev_err(&pdev->dev, "can not get channel\n"); - ret =3D -ENODEV; - goto err_put_controller; + return -ENODEV; } =20 platform_set_drvdata(pdev, spmi_controller); @@ -314,14 +311,10 @@ static int spmi_controller_probe(struct platform_devi= ce *pdev) ret =3D spmi_controller_add(ctrl); if (ret) { dev_err(&pdev->dev, "spmi_controller_add failed with error %d!\n", ret); - goto err_put_controller; + return ret; } =20 return 0; - -err_put_controller: - spmi_controller_put(ctrl); - return ret; } =20 static void spmi_del_controller(struct platform_device *pdev) @@ -329,7 +322,6 @@ static void spmi_del_controller(struct platform_device = *pdev) struct spmi_controller *ctrl =3D platform_get_drvdata(pdev); =20 spmi_controller_remove(ctrl); - spmi_controller_put(ctrl); } =20 static const struct of_device_id spmi_controller_match_table[] =3D { diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c index 74b73f9bc222..eb909a6e3b9e 100644 --- a/drivers/spmi/spmi-mtk-pmif.c +++ b/drivers/spmi/spmi-mtk-pmif.c @@ -437,29 +437,24 @@ static int mtk_spmi_probe(struct platform_device *pde= v) int err, i; u32 chan_offset; =20 - ctrl =3D spmi_controller_alloc(&pdev->dev, sizeof(*arb)); - if (!ctrl) - return -ENOMEM; + ctrl =3D devm_spmi_controller_alloc(&pdev->dev, sizeof(*arb)); + if (IS_ERR(ctrl)) + return PTR_ERR(ctrl); =20 arb =3D spmi_controller_get_drvdata(ctrl); arb->data =3D device_get_match_data(&pdev->dev); if (!arb->data) { - err =3D -EINVAL; dev_err(&pdev->dev, "Cannot get drv_data\n"); - goto err_put_ctrl; + return -EINVAL; } =20 arb->base =3D devm_platform_ioremap_resource_byname(pdev, "pmif"); - if (IS_ERR(arb->base)) { - err =3D PTR_ERR(arb->base); - goto err_put_ctrl; - } + if (IS_ERR(arb->base)) + return PTR_ERR(arb->base); =20 arb->spmimst_base =3D devm_platform_ioremap_resource_byname(pdev, "spmims= t"); - if (IS_ERR(arb->spmimst_base)) { - err =3D PTR_ERR(arb->spmimst_base); - goto err_put_ctrl; - } + if (IS_ERR(arb->spmimst_base)) + return PTR_ERR(arb->spmimst_base); =20 arb->nclks =3D ARRAY_SIZE(pmif_clock_names); for (i =3D 0; i < arb->nclks; i++) @@ -468,7 +463,7 @@ static int mtk_spmi_probe(struct platform_device *pdev) err =3D clk_bulk_get(&pdev->dev, arb->nclks, arb->clks); if (err) { dev_err(&pdev->dev, "Failed to get clocks: %d\n", err); - goto err_put_ctrl; + return err; } =20 err =3D clk_bulk_prepare_enable(arb->nclks, arb->clks); @@ -500,8 +495,6 @@ static int mtk_spmi_probe(struct platform_device *pdev) clk_bulk_disable_unprepare(arb->nclks, arb->clks); err_put_clks: clk_bulk_put(arb->nclks, arb->clks); -err_put_ctrl: - spmi_controller_put(ctrl); return err; } =20 @@ -513,7 +506,6 @@ static void mtk_spmi_remove(struct platform_device *pde= v) clk_bulk_disable_unprepare(arb->nclks, arb->clks); clk_bulk_put(arb->nclks, arb->clks); spmi_controller_remove(ctrl); - spmi_controller_put(ctrl); } =20 static const struct of_device_id mtk_spmi_match_table[] =3D { diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index dcb675d980d4..9ed1180fe31f 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -1443,9 +1443,9 @@ static int spmi_pmic_arb_probe(struct platform_device= *pdev) u32 channel, ee, hw_ver; int err; =20 - ctrl =3D spmi_controller_alloc(&pdev->dev, sizeof(*pmic_arb)); - if (!ctrl) - return -ENOMEM; + ctrl =3D devm_spmi_controller_alloc(&pdev->dev, sizeof(*pmic_arb)); + if (IS_ERR(ctrl)) + return PTR_ERR(ctrl); =20 pmic_arb =3D spmi_controller_get_drvdata(ctrl); pmic_arb->spmic =3D ctrl; @@ -1462,20 +1462,16 @@ static int spmi_pmic_arb_probe(struct platform_devi= ce *pdev) */ res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); core =3D devm_ioremap(&ctrl->dev, res->start, resource_size(res)); - if (IS_ERR(core)) { - err =3D PTR_ERR(core); - goto err_put_ctrl; - } + if (IS_ERR(core)) + return PTR_ERR(core); =20 pmic_arb->core_size =3D resource_size(res); =20 pmic_arb->ppid_to_apid =3D devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID, sizeof(*pmic_arb->ppid_to_apid), GFP_KERNEL); - if (!pmic_arb->ppid_to_apid) { - err =3D -ENOMEM; - goto err_put_ctrl; - } + if (!pmic_arb->ppid_to_apid) + return -ENOMEM; =20 hw_ver =3D readl_relaxed(core + PMIC_ARB_VERSION); =20 @@ -1499,19 +1495,15 @@ static int spmi_pmic_arb_probe(struct platform_devi= ce *pdev) "obsrvr"); pmic_arb->rd_base =3D devm_ioremap(&ctrl->dev, res->start, resource_size(res)); - if (IS_ERR(pmic_arb->rd_base)) { - err =3D PTR_ERR(pmic_arb->rd_base); - goto err_put_ctrl; - } + if (IS_ERR(pmic_arb->rd_base)) + return PTR_ERR(pmic_arb->rd_base); =20 res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "chnls"); pmic_arb->wr_base =3D devm_ioremap(&ctrl->dev, res->start, resource_size(res)); - if (IS_ERR(pmic_arb->wr_base)) { - err =3D PTR_ERR(pmic_arb->wr_base); - goto err_put_ctrl; - } + if (IS_ERR(pmic_arb->wr_base)) + return PTR_ERR(pmic_arb->wr_base); } =20 pmic_arb->max_periphs =3D PMIC_ARB_MAX_PERIPHS; @@ -1522,10 +1514,9 @@ static int spmi_pmic_arb_probe(struct platform_devic= e *pdev) of_property_read_u32(pdev->dev.of_node, "qcom,bus-id", &pmic_arb->bus_instance); if (pmic_arb->bus_instance > 1) { - err =3D -EINVAL; dev_err(&pdev->dev, "invalid bus instance (%u) specified\n", pmic_arb->bus_instance); - goto err_put_ctrl; + return -EINVAL; } =20 if (pmic_arb->bus_instance =3D=3D 0) { @@ -1543,10 +1534,9 @@ static int spmi_pmic_arb_probe(struct platform_devic= e *pdev) } =20 if (pmic_arb->base_apid + pmic_arb->apid_count > pmic_arb->max_periphs) { - err =3D -EINVAL; dev_err(&pdev->dev, "Unsupported APID count %d detected\n", pmic_arb->base_apid + pmic_arb->apid_count); - goto err_put_ctrl; + return -EINVAL; } } else if (hw_ver >=3D PMIC_ARB_VERSION_V5_MIN) { pmic_arb->base_apid =3D 0; @@ -1554,55 +1544,45 @@ static int spmi_pmic_arb_probe(struct platform_devi= ce *pdev) PMIC_ARB_FEATURES_PERIPH_MASK; =20 if (pmic_arb->apid_count > pmic_arb->max_periphs) { - err =3D -EINVAL; dev_err(&pdev->dev, "Unsupported APID count %d detected\n", pmic_arb->apid_count); - goto err_put_ctrl; + return -EINVAL; } } =20 pmic_arb->apid_data =3D devm_kcalloc(&ctrl->dev, pmic_arb->max_periphs, sizeof(*pmic_arb->apid_data), GFP_KERNEL); - if (!pmic_arb->apid_data) { - err =3D -ENOMEM; - goto err_put_ctrl; - } + if (!pmic_arb->apid_data) + return -ENOMEM; =20 dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n", pmic_arb->ver_ops->ver_str, hw_ver); =20 res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "intr"); pmic_arb->intr =3D devm_ioremap_resource(&ctrl->dev, res); - if (IS_ERR(pmic_arb->intr)) { - err =3D PTR_ERR(pmic_arb->intr); - goto err_put_ctrl; - } + if (IS_ERR(pmic_arb->intr)) + return PTR_ERR(pmic_arb->intr); =20 res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "cnfg"); pmic_arb->cnfg =3D devm_ioremap_resource(&ctrl->dev, res); - if (IS_ERR(pmic_arb->cnfg)) { - err =3D PTR_ERR(pmic_arb->cnfg); - goto err_put_ctrl; - } + if (IS_ERR(pmic_arb->cnfg)) + return PTR_ERR(pmic_arb->cnfg); =20 pmic_arb->irq =3D platform_get_irq_byname(pdev, "periph_irq"); - if (pmic_arb->irq < 0) { - err =3D pmic_arb->irq; - goto err_put_ctrl; - } + if (pmic_arb->irq < 0) + return pmic_arb->irq; =20 err =3D of_property_read_u32(pdev->dev.of_node, "qcom,channel", &channel); if (err) { dev_err(&pdev->dev, "channel unspecified.\n"); - goto err_put_ctrl; + return err; } =20 if (channel > 5) { dev_err(&pdev->dev, "invalid channel (%u) specified.\n", channel); - err =3D -EINVAL; - goto err_put_ctrl; + return -EINVAL; } =20 pmic_arb->channel =3D channel; @@ -1610,22 +1590,19 @@ static int spmi_pmic_arb_probe(struct platform_devi= ce *pdev) err =3D of_property_read_u32(pdev->dev.of_node, "qcom,ee", &ee); if (err) { dev_err(&pdev->dev, "EE unspecified.\n"); - goto err_put_ctrl; + return err; } =20 if (ee > 5) { dev_err(&pdev->dev, "invalid EE (%u) specified\n", ee); - err =3D -EINVAL; - goto err_put_ctrl; + return -EINVAL; } =20 pmic_arb->ee =3D ee; mapping_table =3D devm_kcalloc(&ctrl->dev, pmic_arb->max_periphs, sizeof(*mapping_table), GFP_KERNEL); - if (!mapping_table) { - err =3D -ENOMEM; - goto err_put_ctrl; - } + if (!mapping_table) + return -ENOMEM; =20 pmic_arb->mapping_table =3D mapping_table; /* Initialize max_apid/min_apid to the opposite bounds, during @@ -1645,7 +1622,7 @@ static int spmi_pmic_arb_probe(struct platform_device= *pdev) if (err) { dev_err(&pdev->dev, "could not read APID->PPID mapping table, rc=3D %d\= n", err); - goto err_put_ctrl; + return err; } } =20 @@ -1654,8 +1631,7 @@ static int spmi_pmic_arb_probe(struct platform_device= *pdev) &pmic_arb_irq_domain_ops, pmic_arb); if (!pmic_arb->domain) { dev_err(&pdev->dev, "unable to create irq_domain\n"); - err =3D -ENOMEM; - goto err_put_ctrl; + return -ENOMEM; } =20 irq_set_chained_handler_and_data(pmic_arb->irq, pmic_arb_chained_irq, @@ -1669,8 +1645,6 @@ static int spmi_pmic_arb_probe(struct platform_device= *pdev) err_domain_remove: irq_set_chained_handler_and_data(pmic_arb->irq, NULL, NULL); irq_domain_remove(pmic_arb->domain); -err_put_ctrl: - spmi_controller_put(ctrl); return err; } =20 @@ -1681,7 +1655,6 @@ static void spmi_pmic_arb_remove(struct platform_devi= ce *pdev) spmi_controller_remove(ctrl); irq_set_chained_handler_and_data(pmic_arb->irq, NULL, NULL); irq_domain_remove(pmic_arb->domain); - spmi_controller_put(ctrl); } =20 static const struct of_device_id spmi_pmic_arb_match_table[] =3D { --=20 2.42.0.rc1.204.g551eb34607-goog From nobody Fri Sep 20 11:30:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37459C27C40 for ; Thu, 24 Aug 2023 10:43:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240818AbjHXKmh (ORCPT ); Thu, 24 Aug 2023 06:42:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239488AbjHXKmB (ORCPT ); Thu, 24 Aug 2023 06:42:01 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B682A19A2 for ; Thu, 24 Aug 2023 03:41:59 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1bc83a96067so41421375ad.0 for ; Thu, 24 Aug 2023 03:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1692873719; x=1693478519; 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=11OMDqVoPHj88ZJ2JJBotRCN1O2u/mKSOXzwJ5mYolk=; b=TLRyytcCKZ5pvPqDgKQrJygb5/3SMgG9GDYdNw6z2HnL81D20CEDAFstplAijFbP4k bxJu/nxU4QI51JcqgWn43/7+qNZd/RWjEAJgvnKSJyZDLYhX0C6TLk9CFt4gHcJiokv8 /EnejQ+0+FfhONT74+rGUVytbINgjc8WfJPD0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692873719; x=1693478519; 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=11OMDqVoPHj88ZJ2JJBotRCN1O2u/mKSOXzwJ5mYolk=; b=DlLDrH2twFJenV3yJ139zvIgRE7G7w9TFf0YPN3Fhc3LvefOkPpCk5V3ddL7sGm825 p8RrmWvrfS4TVVWUDwjseGUeHPCl92vVgDkcmxs8xc3wv2taF2wHtaRP04kPP5H7nD8H iAslXvfwiW5PQju7lHqOgbkm9rpUhufUZSxrZwbD2K2+k34ydrb6w2Zb9zTYDrmk4MWZ qPh6Gu/+KAL/22J22N738yyxYmKTs3HoQv4fE9FSlwLC+QrBvq2s5YuHlzQkwvS2VGL/ +oO+ae1HhLLPuFNAMOAcrHzhw0jbJ3SDQgGwURVoxnGxZ+QbKe1Z3d5DgWoxWAnn2Aj6 6hng== X-Gm-Message-State: AOJu0YzV+F0po+vLsfoYaB6B+BYE89OyCHbKxlhem8vcpAU97LX2WoRG gPKSqbEXUI9WJDfQcVAivOSjuQ== X-Google-Smtp-Source: AGHT+IEjXqoNHLwL9K3+kgYdZSexg1MmfuqiBw8xGh1DzEWiwriMgsY3wjC8rJhHLSB9/+0if9QOXA== X-Received: by 2002:a17:903:1c4:b0:1bb:b91b:2b3c with SMTP id e4-20020a17090301c400b001bbb91b2b3cmr14732522plh.34.1692873719205; Thu, 24 Aug 2023 03:41:59 -0700 (PDT) Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:ed6d:42e3:a23:8316]) by smtp.gmail.com with ESMTPSA id q2-20020a170902dac200b001b5247cac3dsm12524645plx.110.2023.08.24.03.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 03:41:58 -0700 (PDT) From: Fei Shao To: Stephen Boyd , Chen-Yu Tsai Cc: linux-mediatek@lists.infradead.org, Fei Shao , AngeloGioacchino Del Regno , Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] spmi: mtk-pmif: Reorder driver remove sequence Date: Thu, 24 Aug 2023 18:40:10 +0800 Message-ID: <20230824104101.4083400-4-fshao@chromium.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230824104101.4083400-1-fshao@chromium.org> References: <20230824104101.4083400-1-fshao@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This driver enables clocks and then adds SPMI controller in probing, so we expect the reversed sequence in removal. Fix the order in the remove callback. Signed-off-by: Fei Shao Reviewed-by: AngeloGioacchino Del Regno --- drivers/spmi/spmi-mtk-pmif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c index eb909a6e3b9e..2127bbd2f856 100644 --- a/drivers/spmi/spmi-mtk-pmif.c +++ b/drivers/spmi/spmi-mtk-pmif.c @@ -503,9 +503,9 @@ static void mtk_spmi_remove(struct platform_device *pde= v) struct spmi_controller *ctrl =3D platform_get_drvdata(pdev); struct pmif *arb =3D spmi_controller_get_drvdata(ctrl); =20 + spmi_controller_remove(ctrl); clk_bulk_disable_unprepare(arb->nclks, arb->clks); clk_bulk_put(arb->nclks, arb->clks); - spmi_controller_remove(ctrl); } =20 static const struct of_device_id mtk_spmi_match_table[] =3D { --=20 2.42.0.rc1.204.g551eb34607-goog From nobody Fri Sep 20 11:30:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA5BCC71145 for ; Thu, 24 Aug 2023 10:43:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235818AbjHXKml (ORCPT ); Thu, 24 Aug 2023 06:42:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240762AbjHXKmD (ORCPT ); Thu, 24 Aug 2023 06:42:03 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A80E19A2 for ; Thu, 24 Aug 2023 03:42:01 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1bf078d5f33so52269875ad.3 for ; Thu, 24 Aug 2023 03:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1692873721; x=1693478521; 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=ydoYhmo/zUvr/Z1jqPRUS4uEIJI8i2ctDqfsePibZ0M=; b=j+dJGmOnwFeanBncZxVZvZXDdOANE32WW+vw/iNPUL0ILVzlBSEFppcBXzFD+4nHDw WDZkcvHZrG2lDUkUEqCtDbaDjj6P9RZXLwL+Q2iQl3XehAvnZ06VtCkoHYMZvb1UfJSm XQj5mgQokXWMgcLNvVRQ4s3flUWFlQ95iUaPU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692873721; x=1693478521; 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=ydoYhmo/zUvr/Z1jqPRUS4uEIJI8i2ctDqfsePibZ0M=; b=bm6vCRQ3l+8NjoMVW4CD3CfRE9a3MoiSY+evDdxq98NiN5CmU0mzp56I+5ezw12IZr /Wex/ezpWgQCqYhQKUKkKNDVghT6Q/FjUGcIjQS3WIUoPMlJ+2Nx4B4JnJcmDgw4OF0B cVetnNaY/xkL8R564gQTqTIl+f9YFklPnHryV3ZIYrGZN/ewgncGRecyJNmYkkNfoHlY i0pRUM6HIJiKeb/yWy089SyJ8IEc4+CYEVw4vdghoRMpdEZcpzWR6usXAHxpB7qVu9NJ LtO3/eUruArF8tGmr/YGJFhTMmtyELRNNgmvspfumeymSKxdeV81T7IKzUmYouHMhlFT Nc2w== X-Gm-Message-State: AOJu0YzMwoLMuGMiJ2pSoko9XK7eaMeAm+Muc6nYVJC4YrMQowwJAJ2d D7O3EzXFB2QAiVQGBGpPkYXS4Q== X-Google-Smtp-Source: AGHT+IElZ1QAwdCYRCRyL6bvp8lbkZPrWVHjamIivTYTyzrIfMNAh7MSIJqXviqpBH4X+ld/2/CnDg== X-Received: by 2002:a17:903:2446:b0:1b1:9233:bbf5 with SMTP id l6-20020a170903244600b001b19233bbf5mr17338652pls.57.1692873721059; Thu, 24 Aug 2023 03:42:01 -0700 (PDT) Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:ed6d:42e3:a23:8316]) by smtp.gmail.com with ESMTPSA id q2-20020a170902dac200b001b5247cac3dsm12524645plx.110.2023.08.24.03.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 03:42:00 -0700 (PDT) From: Fei Shao To: Stephen Boyd , Chen-Yu Tsai Cc: linux-mediatek@lists.infradead.org, Fei Shao , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH 4/5] spmi: hisi-spmi-controller: Use devm_spmi_controller_add() Date: Thu, 24 Aug 2023 18:40:11 +0800 Message-ID: <20230824104101.4083400-5-fshao@chromium.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230824104101.4083400-1-fshao@chromium.org> References: <20230824104101.4083400-1-fshao@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert to the device-managed version of spmi_controller_add() and delete the unnecessary driver remove callback. Signed-off-by: Fei Shao --- Note that I skipped the conversions in spmi-mtk-pmif.c and spmi-pmic-arb.c because the driver remove sequence would have been changed, as using the devm version will postpone spmi_controller_remove() to where after remove callback is executed. So it turns out only hisi-spmi-controller.c is updated. drivers/spmi/hisi-spmi-controller.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/spmi/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-c= ontroller.c index a5525902656a..674a350cc676 100644 --- a/drivers/spmi/hisi-spmi-controller.c +++ b/drivers/spmi/hisi-spmi-controller.c @@ -308,7 +308,7 @@ static int spmi_controller_probe(struct platform_device= *pdev) ctrl->read_cmd =3D spmi_read_cmd; ctrl->write_cmd =3D spmi_write_cmd; =20 - ret =3D spmi_controller_add(ctrl); + ret =3D devm_spmi_controller_add(&pdev->dev, ctrl); if (ret) { dev_err(&pdev->dev, "spmi_controller_add failed with error %d!\n", ret); return ret; @@ -317,13 +317,6 @@ static int spmi_controller_probe(struct platform_devic= e *pdev) return 0; } =20 -static void spmi_del_controller(struct platform_device *pdev) -{ - struct spmi_controller *ctrl =3D platform_get_drvdata(pdev); - - spmi_controller_remove(ctrl); -} - static const struct of_device_id spmi_controller_match_table[] =3D { { .compatible =3D "hisilicon,kirin970-spmi-controller", @@ -334,7 +327,6 @@ MODULE_DEVICE_TABLE(of, spmi_controller_match_table); =20 static struct platform_driver spmi_controller_driver =3D { .probe =3D spmi_controller_probe, - .remove_new =3D spmi_del_controller, .driver =3D { .name =3D "hisi_spmi_controller", .of_match_table =3D spmi_controller_match_table, --=20 2.42.0.rc1.204.g551eb34607-goog From nobody Fri Sep 20 11:30:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBFCDC7113B for ; Thu, 24 Aug 2023 10:43:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240811AbjHXKmo (ORCPT ); Thu, 24 Aug 2023 06:42:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240733AbjHXKmF (ORCPT ); Thu, 24 Aug 2023 06:42:05 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 673961991 for ; Thu, 24 Aug 2023 03:42:03 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1bf078d5f33so52270075ad.3 for ; Thu, 24 Aug 2023 03:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1692873723; x=1693478523; 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=R5Mj2qxwRu6ImbCbgKZB2mTmZc1sJ7FaGws4X/FyAcE=; b=hZcQz83MuTgtVUHEdO3LOPIFB0JNUEtBmCMJCDx9VL+8o4UxqsI1LRU5qOk/EXIyhZ 96mdg+nhN+nkSlIDrvQ9tWxN32QvRpmMl2z70EA4VSyUSViZZ1Zz/K9JfTVjQ3fkYxaF gw+rR/aaoD2Q5MAoxZQg20nwNEbqER36/p6cE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692873723; x=1693478523; 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=R5Mj2qxwRu6ImbCbgKZB2mTmZc1sJ7FaGws4X/FyAcE=; b=gCFuA10l4kjLX+c2o9r9SVkVCyDg+b/JyUDwtDwnnoh07+muwuvvtVBJGXwAXJAkmX dYa2xnnP3cksk7hchVMbYgjhMs+efRCzkGFi7cWYKv+H6sUIfcYVJqgTQBt/QE0aPkEP hRxRY+GBEDQ2ynaLcPz5T5yzokgbK+uduABtxFMrtam0Kgy3fxtQSLjMBLsw8w58zdE7 tsyIz4yY6ANCWL7XfZ196a02AIxifHq5CKBkGzCsQ+FT3rF95O6NEYb8rK4C1+he0XsU gWWYzINkAbmqhNY4AF9ydqVnb1wVibAz21hgmB2ByJGvkoq3z9zbV0XaOQe9igsPX4jN 9nQA== X-Gm-Message-State: AOJu0Yws8ogpgnv+POQIUmOPc5pPvgVr/ySR/sItUftoGioKFbDbTb8w 9XqrsgANXk0duhhxncqAtkvQ7ZoCq6I2NzjWezo= X-Google-Smtp-Source: AGHT+IGao9Th9qVXpav06rwJB33LMdKfO90d0/0YX0Nw2S957J/ZS1b/jA6DEO74HGdi3p7m7JgSFw== X-Received: by 2002:a17:903:264d:b0:1bf:364:f013 with SMTP id je13-20020a170903264d00b001bf0364f013mr13653715plb.45.1692873722931; Thu, 24 Aug 2023 03:42:02 -0700 (PDT) Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:ed6d:42e3:a23:8316]) by smtp.gmail.com with ESMTPSA id q2-20020a170902dac200b001b5247cac3dsm12524645plx.110.2023.08.24.03.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 03:42:02 -0700 (PDT) From: Fei Shao To: Stephen Boyd , Chen-Yu Tsai Cc: linux-mediatek@lists.infradead.org, Fei Shao , linux-kernel@vger.kernel.org Subject: [PATCH 5/5] spmi: Return meaningful errors in spmi_controller_alloc() Date: Thu, 24 Aug 2023 18:40:12 +0800 Message-ID: <20230824104101.4083400-6-fshao@chromium.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230824104101.4083400-1-fshao@chromium.org> References: <20230824104101.4083400-1-fshao@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" spmi_controller_alloc() currently returns NULL to all types of errors, which can be improved. Use appropriate error code in returns and pass the errors from used functions where possible. Signed-off-by: Fei Shao --- drivers/spmi/devres.c | 4 ++-- drivers/spmi/spmi.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/spmi/devres.c b/drivers/spmi/devres.c index f18cbbe28812..c19f09243bc3 100644 --- a/drivers/spmi/devres.c +++ b/drivers/spmi/devres.c @@ -20,9 +20,9 @@ struct spmi_controller *devm_spmi_controller_alloc(struct= device *parent, size_t return ERR_PTR(-ENOMEM); =20 ctrl =3D spmi_controller_alloc(parent, size); - if (!ctrl) { + if (IS_ERR(ctrl)) { devres_free(ptr); - return ERR_PTR(-ENOMEM); + return ctrl; } =20 *ptr =3D ctrl; diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index 7313d4c18a04..5f11ced3f8b9 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -445,11 +445,11 @@ struct spmi_controller *spmi_controller_alloc(struct = device *parent, int id; =20 if (WARN_ON(!parent)) - return NULL; + return ERR_PTR(-EINVAL); =20 ctrl =3D kzalloc(sizeof(*ctrl) + size, GFP_KERNEL); if (!ctrl) - return NULL; + return ERR_PTR(-ENOMEM); =20 device_initialize(&ctrl->dev); ctrl->dev.type =3D &spmi_ctrl_type; @@ -463,7 +463,7 @@ struct spmi_controller *spmi_controller_alloc(struct de= vice *parent, dev_err(parent, "unable to allocate SPMI controller identifier.\n"); spmi_controller_put(ctrl); - return NULL; + return ERR_PTR(id); } =20 ctrl->nr =3D id; --=20 2.42.0.rc1.204.g551eb34607-goog