From patchwork Tue Oct 3 15:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 147963 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2165145vqb; Tue, 3 Oct 2023 08:29:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVsZMU9yn22NDqRgjKLbTfPdRdnWfCCxPEg9J5nHH0zm2tkz5xiTHazBS9xTmI+kaH1nxf X-Received: by 2002:a17:902:ea0a:b0:1bb:598a:14e5 with SMTP id s10-20020a170902ea0a00b001bb598a14e5mr18801485plg.43.1696346991831; Tue, 03 Oct 2023 08:29:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696346991; cv=none; d=google.com; s=arc-20160816; b=FrJoY7wZcCL63Cb0wk1Tq+W3GhhoTh1+f0YMrAw7wmm2zZoGo+GQ3oAE7yY6JsVhPD iClBKD5f11QF2qBUkZTiaEVP1TSmXtteIEC8rPHQqvvgWFSdzstrF+J7SQS0FkxBa9KF DRwLMogB6NVYHqY4FP65A7KeWnG850I96O+Eu9z9lW6o7ZnSwcMflPZnejIRllhUl3RM jUrOZ6Qg125Ot2kN9HPIBSZugmka/RnktDClAcCUIj6tYcVBoOWt0m1EJwXJsWJv4Iue qiRQFX7iA5evlsYEBz9oI7LVqaTzVz6DVRuP5of50XxJOC7fadia7eRPhltrnZkjMDI1 5UpA== 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=bI3A4drhNK4r/KWLdWdC8bfV1+hFbw518/inPNmk2wg=; fh=YWm8QJAM0FHN5RikUov0yPYTmJ6LMVE7JeGkozvOeYU=; b=ePChcsOXtmdIW94xXUz7f+qFbcW9Qp5o72hywHo7L5iddt7ZxLOJzmtLn3EQZIhGKu Cz3n5U24ETC0Mj0iN7+pZ3PVm6fct2CaiMvgk7oFnEix3K9M83EXVtkgqtl2Xj9mK6ZP PlQIAmurq56W/YHnfWo7K3N3eYdX08Yf4Ck/v6lODjgKru24mda5A+C01ozVv0qYxjjS CKfwQSYOsoTxzEIZ+geRz4RgZy3S9E+ks5RGcKNkeY3AJLCFCBGW6f88cxGJDljnjoZP PCHq8OnW4q4uuPdYCqefqRbj+LlP3ES9R36x+rih01PV72PFyWhXtS3g2eapjUMJAcig SZQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MtpKhBPf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id 21-20020a170902ee5500b001c3a6902ff1si1537105plo.288.2023.10.03.08.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 08:29:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MtpKhBPf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A371C81A1EBD; Tue, 3 Oct 2023 08:29:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239359AbjJCP3s (ORCPT + 17 others); Tue, 3 Oct 2023 11:29:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231443AbjJCP3i (ORCPT ); Tue, 3 Oct 2023 11:29:38 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5103695; Tue, 3 Oct 2023 08:29:35 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1D75C433C8; Tue, 3 Oct 2023 15:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696346974; bh=tuSq7yhyHWSvaiKeFaqV7WZhQUAQixug8q4HdZYlAno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MtpKhBPfJ74lU82drgA2oKf+YX3mFR/c11kgGMzndTWpPgOi2hEmENkWW/RUWIKv/ oh5Dc+skDITF3WJQnuoVlHm6/mVWDpQkP0KirEUByb3CB8vIdg1p6Fi22woNdGNiN9 co1KQ++cpjOaRrFfa9mbrrixxxpW1IO4bUCFUzx2a9zr1lZVVEK0+AqM/LzJjKKdqY 94P4HEV9pQQq0kFDPiZjWyPVo8TUZHU/d/LN6AXLrgRclPZV2MdYQ8T6IbkQ/BvcYa 2RHOoi0f+7TTAzD7U84ETiymULbdd37n79WUMPjOY/K/rh3LbCMLgDFuBxIZpVqfeS 176Y8xHTs98QQ== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qnhLF-0003uL-2L; Tue, 03 Oct 2023 17:29:45 +0200 From: Johan Hovold To: Lee Jones Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Caleb Connolly , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH 1/5] mfd: qcom-spmi-pmic: fix reference leaks in revid helper Date: Tue, 3 Oct 2023 17:29:23 +0200 Message-ID: <20231003152927.15000-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231003152927.15000-1-johan+linaro@kernel.org> References: <20231003152927.15000-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 03 Oct 2023 08:29:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778748743224774861 X-GMAIL-MSGID: 1778748743224774861 The Qualcomm SPMI PMIC revid implementation is broken in multiple ways. First, it totally ignores struct device_node reference counting and leaks references to the parent bus node as well as each child it iterates over using an open-coded for_each_child_of_node(). Second, it leaks references to each spmi device on the bus that it iterates over by failing to drop the reference taken by the spmi_device_from_of() helper. Fix the struct device_node leaks by reimplementing the lookup using for_each_child_of_node() and adding the missing reference count decrements. Fix the sibling struct device leaks by dropping the unnecessary lookups of devices with the wrong USID. Note that this still leaves one struct device reference leak in case a base device is found but it is not the parent of the device used for the lookup. This will be addressed in a follow-on patch. Fixes: e9c11c6e3a0e ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients") Cc: stable@vger.kernel.org # 6.0 Cc: Caleb Connolly Cc: Dmitry Baryshkov Signed-off-by: Johan Hovold --- drivers/mfd/qcom-spmi-pmic.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c index 7e2cd79d17eb..47738f7e492c 100644 --- a/drivers/mfd/qcom-spmi-pmic.c +++ b/drivers/mfd/qcom-spmi-pmic.c @@ -81,7 +81,7 @@ static struct spmi_device *qcom_pmic_get_base_usid(struct device *dev) struct spmi_device *sdev; struct qcom_spmi_dev *ctx; struct device_node *spmi_bus; - struct device_node *other_usid = NULL; + struct device_node *child; int function_parent_usid, ret; u32 pmic_addr; @@ -105,28 +105,34 @@ static struct spmi_device *qcom_pmic_get_base_usid(struct device *dev) * device for USID 2. */ spmi_bus = of_get_parent(sdev->dev.of_node); - do { - other_usid = of_get_next_child(spmi_bus, other_usid); - - ret = of_property_read_u32_index(other_usid, "reg", 0, &pmic_addr); - if (ret) - return ERR_PTR(ret); + sdev = ERR_PTR(-ENODATA); + for_each_child_of_node(spmi_bus, child) { + ret = of_property_read_u32_index(child, "reg", 0, &pmic_addr); + if (ret) { + of_node_put(child); + sdev = ERR_PTR(ret); + break; + } - sdev = spmi_device_from_of(other_usid); if (pmic_addr == function_parent_usid - (ctx->num_usids - 1)) { - if (!sdev) + sdev = spmi_device_from_of(child); + if (!sdev) { /* * If the base USID for this PMIC hasn't probed yet * but the secondary USID has, then we need to defer * the function driver so that it will attempt to * probe again when the base USID is ready. */ - return ERR_PTR(-EPROBE_DEFER); - return sdev; + sdev = ERR_PTR(-EPROBE_DEFER); + } + of_node_put(child); + break; } - } while (other_usid->sibling); + } + + of_node_put(spmi_bus); - return ERR_PTR(-ENODATA); + return sdev; } static int pmic_spmi_load_revid(struct regmap *map, struct device *dev, From patchwork Tue Oct 3 15:29:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 147964 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2165886vqb; Tue, 3 Oct 2023 08:30:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEN8hiGLOG+2jaL29aC1O5TDZGeusrxjvz4d5ggc49u4V//OLTIUmP6pYvY1ue7Ccnf81v1 X-Received: by 2002:a17:902:e850:b0:1c3:19d6:3559 with SMTP id t16-20020a170902e85000b001c319d63559mr5035956plg.1.1696347055468; Tue, 03 Oct 2023 08:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696347055; cv=none; d=google.com; s=arc-20160816; b=X1cuQl/gyh1mJCJ4dO6EZtbvKGMO0paddr923mEFt3MrxD93dLS2T8Zsdhl/3xTKrq Laf7F30OnXQhelJXK2Ya80cDy3oFnZ1VIN8+ZQ3D3/3JklLVrk/VGiwMw2LCPiAoGi4O JneEyWnHJ+rILnhy8UE3/aHp9BdxhO/ZBmGRR/ETLwiq54Q/8gelPNCNVvbzC5BsLGaH fKs7ce3WwDAzPkAVMYflftqHavtL2cP/b/KE4S9wBlSAk9JSj8ECUvUcWcDWz7p7D6Ye MqQNDLvvRr0rw4YbFgAPxJJiyuuOzC4TuW8PJ2zgNoSfZe4r9fIK9p47/vlBV+Zo5wLQ ZE/Q== 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=+bV0z5OR3NMwAKriIl/wAsShbifXj0uUQf1jl616idE=; fh=YWm8QJAM0FHN5RikUov0yPYTmJ6LMVE7JeGkozvOeYU=; b=Wg2ivixqpXz8zxGAO3lswYmyqlW9u8mChRuOry5nZ3ALtvqmYbLp/YH1W4N7HUKGVh WI/bwtAT8kRLiIaxulwR+ftv4koXKdwbu9CuLPQx5k/wcXzkB/KBNZiI8QWZFlQq0aaJ IG8qa++qjk8JIEXYUqL6XIbB2Nn4bICHIxhHU0d8XFXn0BTn3r1FZiiKnvYLeCISdeVr kGUjot7TFHl2KF2Don4yTAO0xUNoH2g9SoyP09LIGq+jLGTzHEDnDQtJ6yAWZuq8H9Ve XUFw7UnOrkfmlizZBpzi1HPFkNYNzPHVQoENww7JZiLuU0UpMfmBPQb3W+VLh2fW8hmH CyBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="u/bqTdux"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id a15-20020a170902710f00b001bbd0450af8si1524152pll.187.2023.10.03.08.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 08:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="u/bqTdux"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 728A481441A5; Tue, 3 Oct 2023 08:30:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238215AbjJCP3m (ORCPT + 17 others); Tue, 3 Oct 2023 11:29:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232156AbjJCP3i (ORCPT ); Tue, 3 Oct 2023 11:29:38 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57E5BAB; Tue, 3 Oct 2023 08:29:35 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF7FAC433CB; Tue, 3 Oct 2023 15:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696346975; bh=w6oW3CA5lhvBRe2ooxRAdYwa2HiP0AiSXwLhfx4hsQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u/bqTduxmjG7fM8rnm8Fuso35m9V9ijdiz/GM66mSY81rVf16I8i2ceQn4yr41eKh hu5DQUBbpwSsvpG9fKoOBsXtgBcGTxIb4zDnOGGbdDDhAIpde18qyutjeClG78vm4X 3H7Pp3vrDinug7UMjQ4eazdvqczupeszGb+RtBDUtYgymoNchYMOkuEBN6Z8ZJ5nrX TBvyJJ8mZskREjk66lsGFGU1CJmn4FmhLvpZ+Bs6QmI05AzvnPswdEbpmcN/I7CPyB AIZtygRliI0v9KWrzXpagYIDHCcJrdSZtLPU1RWcIbgOlQfcZZm2ICUCL+QEbWzdVY SmhZUixDbKppw== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qnhLF-0003uN-2a; Tue, 03 Oct 2023 17:29:45 +0200 From: Johan Hovold To: Lee Jones Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Caleb Connolly , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH 2/5] mfd: qcom-spmi-pmic: fix revid implementation Date: Tue, 3 Oct 2023 17:29:24 +0200 Message-ID: <20231003152927.15000-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231003152927.15000-1-johan+linaro@kernel.org> References: <20231003152927.15000-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 08:30:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778748731198357509 X-GMAIL-MSGID: 1778748809815975171 The Qualcomm SPMI PMIC revid implementation is broken in multiple ways. First, it assumes that just because the sibling base device has been registered that means that it is also bound to a driver, which may not be the case (e.g. due to probe deferral or asynchronous probe). This could trigger a NULL-pointer dereference when attempting to access the driver data of the unbound device. Second, it accesses driver data of a sibling device directly and without any locking, which means that the driver data may be freed while it is being accessed (e.g. on driver unbind). Third, it leaks a struct device reference to the sibling device which is looked up using the spmi_device_from_of() every time a function (child) device is calling the revid function (e.g. on probe). Fix this mess by reimplementing the revid lookup so that it is done only at probe of the PMIC device; the base device fetches the revid info from the hardware, while any secondary SPMI device fetches the information from the base device and caches it so that it can be accessed safely from its children. If the base device has not been probed yet then probe of a secondary device is deferred. Fixes: e9c11c6e3a0e ("mfd: qcom-spmi-pmic: expose the PMIC revid information to clients") Cc: stable@vger.kernel.org # 6.0 Cc: Caleb Connolly Cc: Dmitry Baryshkov Signed-off-by: Johan Hovold --- drivers/mfd/qcom-spmi-pmic.c | 69 +++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c index 47738f7e492c..8e449cff5cec 100644 --- a/drivers/mfd/qcom-spmi-pmic.c +++ b/drivers/mfd/qcom-spmi-pmic.c @@ -30,6 +30,8 @@ struct qcom_spmi_dev { struct qcom_spmi_pmic pmic; }; +static DEFINE_MUTEX(pmic_spmi_revid_lock); + #define N_USIDS(n) ((void *)n) static const struct of_device_id pmic_spmi_id_table[] = { @@ -76,24 +78,21 @@ static const struct of_device_id pmic_spmi_id_table[] = { * * This only supports PMICs with 1 or 2 USIDs. */ -static struct spmi_device *qcom_pmic_get_base_usid(struct device *dev) +static struct spmi_device *qcom_pmic_get_base_usid(struct spmi_device *sdev, struct qcom_spmi_dev *ctx) { - struct spmi_device *sdev; - struct qcom_spmi_dev *ctx; struct device_node *spmi_bus; struct device_node *child; int function_parent_usid, ret; u32 pmic_addr; - sdev = to_spmi_device(dev); - ctx = dev_get_drvdata(&sdev->dev); - /* * Quick return if the function device is already in the base * USID. This will always be hit for PMICs with only 1 USID. */ - if (sdev->usid % ctx->num_usids == 0) + if (sdev->usid % ctx->num_usids == 0) { + get_device(&sdev->dev); return sdev; + } function_parent_usid = sdev->usid; @@ -118,10 +117,8 @@ static struct spmi_device *qcom_pmic_get_base_usid(struct device *dev) sdev = spmi_device_from_of(child); if (!sdev) { /* - * If the base USID for this PMIC hasn't probed yet - * but the secondary USID has, then we need to defer - * the function driver so that it will attempt to - * probe again when the base USID is ready. + * If the base USID for this PMIC hasn't been + * registered yet then we need to defer. */ sdev = ERR_PTR(-EPROBE_DEFER); } @@ -135,6 +132,35 @@ static struct spmi_device *qcom_pmic_get_base_usid(struct device *dev) return sdev; } +static int pmic_spmi_get_base_revid(struct spmi_device *sdev, struct qcom_spmi_dev *ctx) +{ + struct qcom_spmi_dev *base_ctx; + struct spmi_device *base; + int ret = 0; + + base = qcom_pmic_get_base_usid(sdev, ctx); + if (IS_ERR(base)) + return PTR_ERR(base); + + /* + * Copy revid info from base device if it has probed and is still + * bound to its driver. + */ + mutex_lock(&pmic_spmi_revid_lock); + base_ctx = spmi_device_get_drvdata(base); + if (!base_ctx) { + ret = -EPROBE_DEFER; + goto out_unlock; + } + memcpy(&ctx->pmic, &base_ctx->pmic, sizeof(ctx->pmic)); +out_unlock: + mutex_unlock(&pmic_spmi_revid_lock); + + put_device(&base->dev); + + return ret; +} + static int pmic_spmi_load_revid(struct regmap *map, struct device *dev, struct qcom_spmi_pmic *pmic) { @@ -210,11 +236,7 @@ const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev) if (!of_match_device(pmic_spmi_id_table, dev->parent)) return ERR_PTR(-EINVAL); - sdev = qcom_pmic_get_base_usid(dev->parent); - - if (IS_ERR(sdev)) - return ERR_CAST(sdev); - + sdev = to_spmi_device(dev->parent); spmi = dev_get_drvdata(&sdev->dev); return &spmi->pmic; @@ -249,16 +271,31 @@ static int pmic_spmi_probe(struct spmi_device *sdev) ret = pmic_spmi_load_revid(regmap, &sdev->dev, &ctx->pmic); if (ret < 0) return ret; + } else { + ret = pmic_spmi_get_base_revid(sdev, ctx); + if (ret) + return ret; } + + mutex_lock(&pmic_spmi_revid_lock); spmi_device_set_drvdata(sdev, ctx); + mutex_unlock(&pmic_spmi_revid_lock); return devm_of_platform_populate(&sdev->dev); } +static void pmic_spmi_remove(struct spmi_device *sdev) +{ + mutex_lock(&pmic_spmi_revid_lock); + spmi_device_set_drvdata(sdev, NULL); + mutex_unlock(&pmic_spmi_revid_lock); +} + MODULE_DEVICE_TABLE(of, pmic_spmi_id_table); static struct spmi_driver pmic_spmi_driver = { .probe = pmic_spmi_probe, + .remove = pmic_spmi_remove, .driver = { .name = "pmic-spmi", .of_match_table = pmic_spmi_id_table, From patchwork Tue Oct 3 15:29:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 147961 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2165080vqb; Tue, 3 Oct 2023 08:29:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/CZREL7OKQRXRubadLGRmIjqnrXKs9ITmZFHYN0fLpM6S7FtKBs7iwQXt3Zslozr0+O9Y X-Received: by 2002:a17:90a:4c85:b0:276:7907:ecf with SMTP id k5-20020a17090a4c8500b0027679070ecfmr11641554pjh.36.1696346985477; Tue, 03 Oct 2023 08:29:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696346985; cv=none; d=google.com; s=arc-20160816; b=NVc6ZqXy0Kq6qMdSWQnzU64uj66MS5G7e6rodOVJ+V/uJgHgzbDnhhBs8waIB8JzAM C+TL+msIHA7fDWg/FO6CDs5NH1g0UHAZYyJVRw/OjareD3HJP3WUS4wR/SY6eimLEw/j bLoWgAi5F6jWduhr4OgKtI/DvDpfemDMYXYNaDU+Arh0h1hyrtEaMhYFNKVX3OdKL9Yz hu4YZ0e/5UZsThi59IrVmidTtfKvCglD4IxWOnxRtbto/ec2/olmYlK4ZJM5afybDKTh 8P3Kof08l9UNC0NIAVKfu6drkx2IjQGOKLSE/hOrSnbvEHDx3gQ5vakGHKebWU+Ws0IW YfEQ== 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=BhM2ZwMD9fIZ70+dEdlLkbfpGi/Qn+nYNMshHA3ZNZg=; fh=AI8r/JvGuyuehyNrjB6kC4VCCb7N9TwD6vcK6cIxpvM=; b=ZkIU5H/QadEyJO16YJ5FvvSeSukIC/MpLbN6HX2pfT7bpqn0h610e0Kowi57GiyvvF y4BZHdMNLnW24gv2XwEkY4koqAwWNMrxi1D9ZDYiFb21BLNBz7BX0eUeF2yhW7ajORai 7cyvuiRTn+HqOSujFvQZg/KByT7G2ZjD+u76HeqwvcDWVoeRGixIEY8ChkRcnEt4G5qw WdzH17eX6S4iaM4fc0zzfZkKvhhVLCapg1TXFcQexCjweyKAmtNWjdJ6hHBTgPTG3N7P T90rMGi1IWGJxR2XFhDPgFXMTYBJmwWqOhHSF1ErwiQX/N4wDHQ+TUl/METwVVz+fyVl qB0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HfH+56jD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n13-20020a17090ac68d00b00262f937bf93si1680345pjt.77.2023.10.03.08.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 08:29:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HfH+56jD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A2FD881A1EB6; Tue, 3 Oct 2023 08:29:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237708AbjJCP3l (ORCPT + 17 others); Tue, 3 Oct 2023 11:29:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbjJCP3i (ORCPT ); Tue, 3 Oct 2023 11:29:38 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53781A7; Tue, 3 Oct 2023 08:29:35 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2069C433CC; Tue, 3 Oct 2023 15:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696346975; bh=HtTtHLoy/MEzOVrBl6HeLbM2k/FSWqbhpLx6b5+quR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HfH+56jDO4zxiShPdqoi4Vuh7ctOnxMEghAm0nReivKZMqBx8zLfJoZmmvdCTfwDJ shNDol7mXZvIwlj7eRp7r+RPzrUyCVyyYyMNUJKCFIQbXkTra8L3xGlgp4cvl6BhEt B0l3woOTIPyump/qHTMvJcgF5qY/KUeIgTR7mH/1G5/+p4GMP0KcOzU2oRQerw6AdR iZDYjBQe7qwuqc/wFGB/Iram0zn1nUamZXGu7n8sWwckC2G4X+Km1hbS243Czp9lnG k04k9ABPRCBhzBDS31TwTQ72/Y13glbigHYdJK/bqM8/qn0dVG0SXasSgImyRImqeM ob+CPFEkpC+dQ== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qnhLF-0003uP-2s; Tue, 03 Oct 2023 17:29:45 +0200 From: Johan Hovold To: Lee Jones Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Caleb Connolly , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/5] mfd: qcom-spmi-pmic: switch to EXPORT_SYMBOL_GPL() Date: Tue, 3 Oct 2023 17:29:25 +0200 Message-ID: <20231003152927.15000-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231003152927.15000-1-johan+linaro@kernel.org> References: <20231003152927.15000-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 03 Oct 2023 08:29:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778748736275637253 X-GMAIL-MSGID: 1778748736275637253 Switch to using EXPORT_SYMBOL_GPL() for the revid helper as there is no reason not to use it. Cc: Caleb Connolly Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- drivers/mfd/qcom-spmi-pmic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c index 8e449cff5cec..ee55f09da3ba 100644 --- a/drivers/mfd/qcom-spmi-pmic.c +++ b/drivers/mfd/qcom-spmi-pmic.c @@ -241,7 +241,7 @@ const struct qcom_spmi_pmic *qcom_pmic_get(struct device *dev) return &spmi->pmic; } -EXPORT_SYMBOL(qcom_pmic_get); +EXPORT_SYMBOL_GPL(qcom_pmic_get); static const struct regmap_config spmi_regmap_config = { .reg_bits = 16, From patchwork Tue Oct 3 15:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 147965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2165888vqb; Tue, 3 Oct 2023 08:30:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4J6n3vJ5IstKOS59ntScmn8p8Ef4lDeRPUtvntrY3OU+LTb3tJt+bjFnn9xdV8mgYUjMz X-Received: by 2002:a05:6870:b6a7:b0:1dc:c65e:ded2 with SMTP id cy39-20020a056870b6a700b001dcc65eded2mr18825497oab.12.1696347055527; Tue, 03 Oct 2023 08:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696347055; cv=none; d=google.com; s=arc-20160816; b=U3LPdFa/MEas839U+w7ZZPOKDzXLvmO2chW1eXfqNvoE+l+dqYnGEHclai9XCQtLhs Kj+Sawe5yD/a2AhxDmEuJMuyqdJxRXS+0rrMhuWz/Vph55wGu7jro+xrcwYcjzMP0kbB gTGJPp5MFWf+oK8Gmm9Jr1rCTzm8qB3Y6i7Lsxq4VaZ3FJG2FMtGKpyeVWtCgz4sFaFE islbfSFiHzEJ8/z+XxgZOJSjZpLsQkL+3E8EVrXZ97YyTS/Dcxoe5g+lm+f7LbZn0OrB CLCyate9Qh2AFX+RNoA6doZ2bSPkdyQXudv7N2ep1hnVkEwiMi70L+lTzJ7gcYIQ01AU 85sA== 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=j8iPcEPieENGuMmXgwKh+mpKMzMMWHos6/ow4lRowtE=; fh=AI8r/JvGuyuehyNrjB6kC4VCCb7N9TwD6vcK6cIxpvM=; b=PNTK0s+d6FqAbo9pKj0LzXgB3aQn5zmDtjcYnd4cavy7KdonaKqpyXCqsNNoelwfsk rceJRAZwsbt5iJE5Ko8J2qx5ngtpfZvj2Pln5UvepY1h+bb4sOwCQAEzJjCoz99Epw+N iv1AeFEf/mtXcSLBVcvIgPmMFxPwNFgOby67MA3yeUEMxGXNvDWp1NoBEsgEQ4IgTKdv TJbG9aTydPj4sSUVQmlk6gBOjfa4YYUEkoqBT66ITrSLwt2ItMxatv98dIX/D70dOVEE cafT5IZafanzvPzMtETdV7dDIvNs59HQdLwHOR18drSM4OK+pJKowtpjYESJViWOddc1 c34w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qVm99Fa6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id h11-20020a65480b000000b0058938dc0fcasi1295899pgs.257.2023.10.03.08.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 08:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qVm99Fa6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2B4548077A7A; Tue, 3 Oct 2023 08:30:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239431AbjJCP3v (ORCPT + 17 others); Tue, 3 Oct 2023 11:29:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232615AbjJCP3j (ORCPT ); Tue, 3 Oct 2023 11:29:39 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C4C683; Tue, 3 Oct 2023 08:29:36 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00D60C433CA; Tue, 3 Oct 2023 15:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696346975; bh=Ppt/g3Cl4BHkM08VzrqupcDO3feWwrL0moCYx1utEJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qVm99Fa6ss1iQNSqspl+Urb3rwwwlivA0jCA8aOX7t/Mj27kTtZ+9oW6JEoQU/Hud WZsLqwUD+XHvM858bygzJNGZY/OToOnDry2MI5InxY3OBibFZu52ehILb2jIXVmbQy 1inWPIP4du8YG8DtLuurmK3YK2nIB9weWJxUGYV85lSeocB10FYxNNokA7CLcwZri/ 6TDmJolb02NDKMYarHu+UqI47KsAHf38wuvWIblb7KFwjfOSUO3aSt1UEtnNv5sc9D as/WnpfEhq6NwxquezjtLgY1YfwLr2kUjrLQIsMhWNBv8+sbu5VrdfdZQrzQ1qAYMx RQTCslknGew5g== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qnhLF-0003uR-38; Tue, 03 Oct 2023 17:29:46 +0200 From: Johan Hovold To: Lee Jones Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Caleb Connolly , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 4/5] spmi: document spmi_device_from_of() refcounting Date: Tue, 3 Oct 2023 17:29:26 +0200 Message-ID: <20231003152927.15000-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231003152927.15000-1-johan+linaro@kernel.org> References: <20231003152927.15000-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 08:30:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778748810011197140 X-GMAIL-MSGID: 1778748810011197140 Add a comment documenting that the spmi_device_from_of() takes a reference to the embedded struct device that needs to be dropped after use. Signed-off-by: Johan Hovold Acked-by: Stephen Boyd --- drivers/spmi/spmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index 7313d4c18a04..ca2fd4d72fa6 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -392,6 +392,9 @@ static struct bus_type spmi_bus_type = { * * @np: device node * + * Takes a reference to the embedded struct device which needs to be dropped + * after use. + * * Returns the struct spmi_device associated with a device node or NULL. */ struct spmi_device *spmi_device_from_of(struct device_node *np) From patchwork Tue Oct 3 15:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 147962 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2165125vqb; Tue, 3 Oct 2023 08:29:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgMAFQKvKtjVXAlygKez/Lm6jciVdFDga4Lp2HmcahAFOPmGTQFEpy5lv/4Zg2Xm2c7hFf X-Received: by 2002:a17:902:e54a:b0:1c6:2d13:5b74 with SMTP id n10-20020a170902e54a00b001c62d135b74mr15096651plf.55.1696346990445; Tue, 03 Oct 2023 08:29:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696346990; cv=none; d=google.com; s=arc-20160816; b=NTj+rJOaECuOBEfgKxnlGKGU0wqFb/JvKkJwqT0uZ6iSHQ2X8KCr0BtxZeSrPB8aCo NLB+fTXGPd4C7wqDeU2C9JklgdYRH4Hd5pjIRV6y1Tqq46qJ0A6Xp1NdIFe2HhaBMB4K 9xlpHEaG+7rd/9Riv5VWN61CAJbZ6c2Fg8XdT0/eMWAArx0Tmnm432Ow1JCchykys6v6 tgZQXdv4m+95YYfj6jZF6VpyF4EAolegBdOndA3gLdNg3m8T0GwzSgissNrTzrQ/V4O6 hAKGK5iMG98v6C2NmaAZR4LZDz5meSPKZz76JiA9LOHa4CeF1DxaZZyPCA2BqA6Gbrzy 1YWQ== 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=pMOnDD3oKWHtOhYsxKc79bi4IYt+1r6NHzxG4U81z9U=; fh=AI8r/JvGuyuehyNrjB6kC4VCCb7N9TwD6vcK6cIxpvM=; b=oORLTGhQFszM2AOoVyW7b8fJ+gpRted5URg4DiJnhNYZu0VV04XIVYyzEM/FEiNjJh o9lrunDMiYVxeFFi2ePU/MzQVObkOUy9koy1SSOt8nrjkAUplkb4GkkeOHxCnv01rAvw q1YYWVHXX34b3GCePxzSgN8Kw3r2apwF8SCMiXkicDAmDWJEEvjFuEyfJCbTE7KnmNk5 vlXZ5vcEN19D9Tlh8XD4QHRkx0CnLtkVFBW++aJwQLLCLfiiIMD+Pq27NxavokP37lYm 1tHRdPRV1AXrVBr9t1YjE5uyzBPqfOxC9VxIplyXb8OPGfAI2ZTFl1yOHR5h+3Hezq9h wIzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ox3Ejze1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id n5-20020a170903110500b001c62e42ad8bsi1799112plh.72.2023.10.03.08.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 08:29:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ox3Ejze1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 7B6DC829BD66; Tue, 3 Oct 2023 08:29:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239244AbjJCP3p (ORCPT + 17 others); Tue, 3 Oct 2023 11:29:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232496AbjJCP3i (ORCPT ); Tue, 3 Oct 2023 11:29:38 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53F41A9; Tue, 3 Oct 2023 08:29:35 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED710C433C7; Tue, 3 Oct 2023 15:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696346975; bh=tbdzRhwZFSqvsJIFtunVh/DHqwi88SOjLub9TshtNR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ox3Ejze1ovNPXtV7c7sI+2L1MJYiNnoXZ6s/fRB6CCWoFMy97C01RMVSwC2q7TyyG Rt14gyTXxXyZFzdS3Q/r/bdV3RDPr2JvuJW5TBpbXqeYvYIFne+C0ILvLvxgwk3AfR 6r0H7jN+ndgQXsFZJ1akCEg0NNMko7BvNGDmrsLCyGg5RjQoE1jEtV2u2Q0dp0HeGA +2WlAGSc/A94u0HNQchG8Mw4AKpmYMlBJOaV6eOOTnShc+GfyD6nguVjteXYo1k7gH doIHu5gCOnDDe1od5Wxy/S8begbXwL30aXMYeeRnUSTz+RpZ6/OVpl/wlnxrnCwQnk MdMsYM4gglw+w== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from ) id 1qnhLG-0003uT-0E; Tue, 03 Oct 2023 17:29:46 +0200 From: Johan Hovold To: Lee Jones Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Stephen Boyd , Caleb Connolly , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 5/5] spmi: rename spmi device lookup helper Date: Tue, 3 Oct 2023 17:29:27 +0200 Message-ID: <20231003152927.15000-6-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231003152927.15000-1-johan+linaro@kernel.org> References: <20231003152927.15000-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 08:29:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778748742002186195 X-GMAIL-MSGID: 1778748742002186195 Rename the SPMI device helper which is used to lookup a device from its OF node as spmi_find_device_by_of_node() so that it reflects the implementation and matches how other helpers like this are named. This will specifically make it more clear that this is a lookup function which returns a reference counted structure. Signed-off-by: Johan Hovold Acked-by: Stephen Boyd --- drivers/mfd/qcom-spmi-pmic.c | 2 +- drivers/spmi/spmi.c | 6 +++--- include/linux/spmi.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c index ee55f09da3ba..1c17adeb7a6d 100644 --- a/drivers/mfd/qcom-spmi-pmic.c +++ b/drivers/mfd/qcom-spmi-pmic.c @@ -114,7 +114,7 @@ static struct spmi_device *qcom_pmic_get_base_usid(struct spmi_device *sdev, str } if (pmic_addr == function_parent_usid - (ctx->num_usids - 1)) { - sdev = spmi_device_from_of(child); + sdev = spmi_find_device_by_of_node(child); if (!sdev) { /* * If the base USID for this PMIC hasn't been diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index ca2fd4d72fa6..93cd4a34debc 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -388,7 +388,7 @@ static struct bus_type spmi_bus_type = { }; /** - * spmi_device_from_of() - get the associated SPMI device from a device node + * spmi_find_device_by_of_node() - look up an SPMI device from a device node * * @np: device node * @@ -397,7 +397,7 @@ static struct bus_type spmi_bus_type = { * * Returns the struct spmi_device associated with a device node or NULL. */ -struct spmi_device *spmi_device_from_of(struct device_node *np) +struct spmi_device *spmi_find_device_by_of_node(struct device_node *np) { struct device *dev = bus_find_device_by_of_node(&spmi_bus_type, np); @@ -405,7 +405,7 @@ struct spmi_device *spmi_device_from_of(struct device_node *np) return to_spmi_device(dev); return NULL; } -EXPORT_SYMBOL_GPL(spmi_device_from_of); +EXPORT_SYMBOL_GPL(spmi_find_device_by_of_node); /** * spmi_device_alloc() - Allocate a new SPMI device diff --git a/include/linux/spmi.h b/include/linux/spmi.h index eac1956a8727..2a4ce4144f9f 100644 --- a/include/linux/spmi.h +++ b/include/linux/spmi.h @@ -166,7 +166,7 @@ static inline void spmi_driver_unregister(struct spmi_driver *sdrv) struct device_node; -struct spmi_device *spmi_device_from_of(struct device_node *np); +struct spmi_device *spmi_find_device_by_of_node(struct device_node *np); int spmi_register_read(struct spmi_device *sdev, u8 addr, u8 *buf); int spmi_ext_register_read(struct spmi_device *sdev, u8 addr, u8 *buf, size_t len);