From nobody Tue Dec 30 11:38:57 2025 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 EE5BBC072A2 for ; Wed, 15 Nov 2023 21:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344689AbjKOVAL (ORCPT ); Wed, 15 Nov 2023 16:00:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344925AbjKOU7v (ORCPT ); Wed, 15 Nov 2023 15:59:51 -0500 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF462173B for ; Wed, 15 Nov 2023 12:59:05 -0800 (PST) Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3b2e72fe47fso63616b6e.1 for ; Wed, 15 Nov 2023 12:59:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081945; x=1700686745; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rWue5MGrIGXtdwa0DXl26EeYVBaPfv4b8agF9tN7BTk=; b=YofpyesxDUNmWDWE91fSi5uorgYYyWs0Jxh9dIidcyyMR8o116h8CyvPKvmjmg9gKb taONfl+X6CqxmaIbtKaP8HE42GXoUdEtQ+jf1+3ow/hU4L2fLsPy6yOkY9x58mQFI2wQ 5A5Evsz/qywQf33L/vEPVzx6hSZzVrhKyjkBWnE82XGnD+shObhS7NjEULitzuhVCYzR kCZSdYaMKk+PeojB+WmC5Hccs7ccddBf4KgYKWn1A30IXbcVyxhnlLyrWoPuCXvwV48W xxCnPSNkesfz+fKyBh7zJqtT67/6nvbSnVHqr7aKOqjvVcEBxGE+kUP+CPM5WZBaaHuw Wgzg== X-Gm-Message-State: AOJu0YxX5HrWM5DFhq7+9ooykIUlaXYKTIE7zk1umAw54TC7szd2bKcA 0kcDZww+G3X/iDYOqjo4qOVQB5yMxg== X-Google-Smtp-Source: AGHT+IFuVEdngiswllHpeBpLA6ZHJAf8BU1GB6j5HsXZXn+UNlYH2/CSecjlOqxQWtnfpSG25qCQ2A== X-Received: by 2002:a05:6808:4193:b0:3b6:cb02:533b with SMTP id dj19-20020a056808419300b003b6cb02533bmr13975007oib.44.1700081945112; Wed, 15 Nov 2023 12:59:05 -0800 (PST) Received: from herring.priv (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id a9-20020a05680804c900b003b29c2f50f0sm1588527oie.18.2023.11.15.12.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:59:04 -0800 (PST) Received: (nullmailer pid 3732930 invoked by uid 1000); Wed, 15 Nov 2023 20:59:01 -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: [RESEND PATCH] reset: Use device_get_match_data() Date: Wed, 15 Nov 2023 14:58:48 -0600 Message-ID: <20231115205848.3732609-1-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 Reviewed-by: Patrice Chotard --- 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