From nobody Fri Jan 2 17:24:52 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 7C9A9CD6138 for ; Mon, 9 Oct 2023 21:15:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378798AbjJIVO7 (ORCPT ); Mon, 9 Oct 2023 17:14:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378710AbjJIVOe (ORCPT ); Mon, 9 Oct 2023 17:14:34 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFBCFC6 for ; Mon, 9 Oct 2023 14:14:27 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E0C1C433CC; Mon, 9 Oct 2023 21:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696886067; bh=bcVRBerKLN3z3a+n5ySbsO9a5UW+yPFpaZA09Z5pSJk=; h=From:To:Cc:Subject:Date:From; b=GXEcZDA6r/rvEEam379V7bL2vQA6BSnMY/2ii+6JzoSKwAZ7fCq4dvF2giTpe2LgD dRHLvHwuzHOHW0qi1/g923ZkJLX6U8xVJMm+3YBYtnzq+1PvH1mg0gzVP75oQN95hl UIRGfg7IUGUqcwXrY9FEKK9huJzVdjBlk0hiSJgDFPUt14CQztmQ+JpUUXTkY6padr qMype6Kyk8Lin20Tm5giIT0/q3jqVLFSLocLdRMRzJ11/VoKNeYQll+KSKnLoOcnKg iVrOQrGhzcu75mrrpWLJowrpSc8ax9RluLmdXcq9+UYQB83go3Hnb+r4LZSUQ63+uG eg4CwyTfHiQxg== Received: (nullmailer pid 3246090 invoked by uid 1000); Mon, 09 Oct 2023 21:14:13 -0000 From: Rob Herring To: Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Philipp Zabel , Patrice Chotard Cc: openbmc@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] reset: Use device_get_match_data() Date: Mon, 9 Oct 2023 16:13:41 -0500 Message-ID: <20231009211356.3242037-11-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/reset/reset-npcm.c | 5 ++--- drivers/reset/sti/reset-syscfg.c | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/reset/reset-npcm.c b/drivers/reset/reset-npcm.c index f6c4f854f2be..8935ef95a2d1 100644 --- a/drivers/reset/reset-npcm.c +++ b/drivers/reset/reset-npcm.c @@ -6,8 +6,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -351,8 +351,7 @@ static int npcm_usb_reset(struct platform_device *pdev,= struct npcm_rc_data *rc) } } =20 - rc->info =3D (const struct npcm_reset_info *) - of_match_device(dev->driver->of_match_table, dev)->data; + rc->info =3D device_get_match_data(dev); switch (rc->info->bmc_id) { case BMC_NPCM7XX: npcm_usb_reset_npcm7xx(rc); diff --git a/drivers/reset/sti/reset-syscfg.c b/drivers/reset/sti/reset-sys= cfg.c index c1ba04f6f155..2324060b747c 100644 --- a/drivers/reset/sti/reset-syscfg.c +++ b/drivers/reset/sti/reset-syscfg.c @@ -7,10 +7,11 @@ */ #include #include +#include #include #include #include -#include +#include #include #include =20 @@ -183,14 +184,14 @@ static int syscfg_reset_controller_register(struct de= vice *dev, int syscfg_reset_probe(struct platform_device *pdev) { struct device *dev =3D pdev ? &pdev->dev : NULL; - const struct of_device_id *match; + const void *data; =20 if (!dev || !dev->driver) return -ENODEV; =20 - match =3D of_match_device(dev->driver->of_match_table, dev); - if (!match || !match->data) + data =3D device_get_match_data(&pdev->dev); + if (!data) return -EINVAL; =20 - return syscfg_reset_controller_register(dev, match->data); + return syscfg_reset_controller_register(dev, data); } --=20 2.42.0