From nobody Fri Sep 20 13:32:33 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