From nobody Sat Feb 7 16:26:10 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 E2F76CDB483 for ; Tue, 17 Oct 2023 20:34:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234791AbjJQUem (ORCPT ); Tue, 17 Oct 2023 16:34:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231149AbjJQUek (ORCPT ); Tue, 17 Oct 2023 16:34:40 -0400 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 212F8BA for ; Tue, 17 Oct 2023 13:34:39 -0700 (PDT) Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3af957bd7e9so3924899b6e.3 for ; Tue, 17 Oct 2023 13:34:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697574878; x=1698179678; 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=RjMxNklY9G/+xqQ/lM5xPuWR9yO1uXO1qqREMwyoCLU=; b=hn2ce0fMUJOm4wbstqtggLq7iHP9bi6gSPQasH60fWYND8228Gw+JMDMFC82l/mUCY bvIuOjUCF4JyhLbEPBYAvCAtF6L0iXdQb+pqWeWokIFCXNT9wyTKjD4WETkefQUbe3Jk th4u+RZdrUJjGGGgyIL0Gj70J9eopFAtk6vEd6FeXBsLQBGo3QT99DX+spEQhOiYAIXs V/oCfWqQTcr53OwDw7AXuO2JMSl1R5k8OxqoIC6W4AXaCr7Zlhz5l1iIUZMg9eygw42n K038pH4F058G3l1j/PNK3yesdgVin5pNfkA5RerS2MFieusRmK+/MQ8SrplOEGmFm2JM bC/g== X-Gm-Message-State: AOJu0Yyhj75iJLoO0s0SYDqQuUNMUktXFIfKLpTP8bmRCnALw4vo1vDN U1BurprCiuoAJ60JAgjZ6A== X-Google-Smtp-Source: AGHT+IEY/Q80f+aO2Wk9Wu/rVQyhEfg8vbYxNWal8XEX+SBftdXW74LwcitRBEMycxZ+fdBFCbDE0A== X-Received: by 2002:a54:4706:0:b0:3ad:29a4:f560 with SMTP id k6-20020a544706000000b003ad29a4f560mr3760803oik.34.1697574878227; Tue, 17 Oct 2023 13:34:38 -0700 (PDT) Received: from herring.priv (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id z26-20020a54459a000000b003af60f06629sm379032oib.6.2023.10.17.13.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 13:34:37 -0700 (PDT) Received: (nullmailer pid 2699232 invoked by uid 1000); Tue, 17 Oct 2023 20:34:36 -0000 From: Rob Herring To: Support Opensource , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Subject: [RESEND PATCH] regulator: da9121: Use i2c_get_match_data() Date: Tue, 17 Oct 2023 15:34:28 -0500 Message-ID: <20231017203429.2699039-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 i2c_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/regulator/da9121-regulator.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da912= 1-regulator.c index 80098035bb13..b551a400bdd1 100644 --- a/drivers/regulator/da9121-regulator.c +++ b/drivers/regulator/da9121-regulator.c @@ -13,7 +13,7 @@ // // Copyright (C) 2020 Dialog Semiconductor =20 -#include +#include #include #include #include @@ -1117,17 +1117,6 @@ static const struct of_device_id da9121_dt_ids[] =3D= { }; MODULE_DEVICE_TABLE(of, da9121_dt_ids); =20 -static inline int da9121_of_get_id(struct device *dev) -{ - const struct of_device_id *id =3D of_match_device(da9121_dt_ids, dev); - - if (!id) { - dev_err(dev, "%s: Failed\n", __func__); - return -EINVAL; - } - return (uintptr_t)id->data; -} - static int da9121_i2c_probe(struct i2c_client *i2c) { struct da9121 *chip; @@ -1141,7 +1130,7 @@ static int da9121_i2c_probe(struct i2c_client *i2c) } =20 chip->pdata =3D i2c->dev.platform_data; - chip->subvariant_id =3D da9121_of_get_id(&i2c->dev); + chip->subvariant_id =3D (enum da9121_subvariant)i2c_get_match_data(i2c); =20 ret =3D da9121_assign_chip_model(i2c, chip); if (ret < 0) --=20 2.42.0