From nobody Fri Jan 2 17:31:31 2026 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 89519CD6114 for ; Mon, 9 Oct 2023 17:32:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377990AbjJIRcb (ORCPT ); Mon, 9 Oct 2023 13:32:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377987AbjJIRc1 (ORCPT ); Mon, 9 Oct 2023 13:32:27 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19E43DE for ; Mon, 9 Oct 2023 10:32:25 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97CF4C433C8; Mon, 9 Oct 2023 17:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696872744; bh=TJcaLAvlDM/rrjbQA5dPMPlECokIUSf7lD2UtWsTWBc=; h=From:To:Cc:Subject:Date:From; b=Z40JeD4ruBmtp+Dr0QAYPc1+X2CJDGfSG9nksOlkJmRghxJQpJ1zWHgtWndh6zvsp BnnZD60Gjwcuh5d0deXFyL4x+SC2Pr0p97i6Fhg9IDSsEYXtSFlJ9Lpi/AXeucRcYg FcYUgPxHIQuXB7k4w31EKLfwRhNdiHf7CEACnajmZAmB8Gk29w8f3o+DuIgwJ/mJ8T EpXOTWKl6uuOw8UO5r60zrMWy0BUEPEovnOOciXQGgFZ61166vfPlI7bAXLFmGf6kH JtrWcoThx3kR5fRpUr4J3L/celDzBQKxEkRvqa5wl+q6yd0Gx6kC5IaWnFGVd7la+I daYg5AP96EkFA== Received: (nullmailer pid 2524703 invoked by uid 1000); Mon, 09 Oct 2023 17:32:22 -0000 From: Rob Herring To: Srinivas Kandagatla , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Maxime Coquelin , Alexandre Torgue Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH] nvmem: Use device_get_match_data() Date: Mon, 9 Oct 2023 12:29:07 -0500 Message-ID: <20231009172923.2457844-12-robh@kernel.org> X-Mailer: git-send-email 2.42.0 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" Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring --- drivers/nvmem/mxs-ocotp.c | 10 ++++------ drivers/nvmem/stm32-romem.c | 7 ++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/nvmem/mxs-ocotp.c b/drivers/nvmem/mxs-ocotp.c index 588ab56d75b7..7b78f18f9545 100644 --- a/drivers/nvmem/mxs-ocotp.c +++ b/drivers/nvmem/mxs-ocotp.c @@ -13,8 +13,9 @@ #include #include #include -#include +#include #include +#include #include #include =20 @@ -140,11 +141,10 @@ static int mxs_ocotp_probe(struct platform_device *pd= ev) struct device *dev =3D &pdev->dev; const struct mxs_data *data; struct mxs_ocotp *otp; - const struct of_device_id *match; int ret; =20 - match =3D of_match_device(dev->driver->of_match_table, dev); - if (!match || !match->data) + data =3D device_get_match_data(dev); + if (!data) return -EINVAL; =20 otp =3D devm_kzalloc(dev, sizeof(*otp), GFP_KERNEL); @@ -169,8 +169,6 @@ static int mxs_ocotp_probe(struct platform_device *pdev) if (ret) return ret; =20 - data =3D match->data; - ocotp_config.size =3D data->size; ocotp_config.priv =3D otp; ocotp_config.dev =3D dev; diff --git a/drivers/nvmem/stm32-romem.c b/drivers/nvmem/stm32-romem.c index 1541c20709d2..8a553b1799a8 100644 --- a/drivers/nvmem/stm32-romem.c +++ b/drivers/nvmem/stm32-romem.c @@ -10,7 +10,9 @@ #include #include #include -#include +#include +#include +#include #include =20 #include "stm32-bsec-optee-ta.h" @@ -211,8 +213,7 @@ static int stm32_romem_probe(struct platform_device *pd= ev) =20 priv->lower =3D 0; =20 - cfg =3D (const struct stm32_romem_cfg *) - of_match_device(dev->driver->of_match_table, dev)->data; + cfg =3D device_get_match_data(dev); if (!cfg) { priv->cfg.read_only =3D true; priv->cfg.size =3D resource_size(res); --=20 2.42.0