From nobody Fri Jan 2 17:09:12 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 5CB35CD6137 for ; Mon, 9 Oct 2023 21:14:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378661AbjJIVOZ (ORCPT ); Mon, 9 Oct 2023 17:14:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378672AbjJIVOS (ORCPT ); Mon, 9 Oct 2023 17:14:18 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8573B6 for ; Mon, 9 Oct 2023 14:14:16 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8730C433C9; Mon, 9 Oct 2023 21:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696886056; bh=92q9941Hk6m7vrKfgjduGlCt6AEAywwnij4Ddy51frE=; h=From:To:Cc:Subject:Date:From; b=k/XXo9gc9QlbY1l77U8Bza5aj3POoieELBtW3oTcLKEroFgmzY6hF8Z6WnLXPKVmi k3j4xeehd3SO9gEkK4GtqhpbS8WImuaArc39fUXNX7/XmiVR+K+Tdilkw0IKLKlLkF 1ZwdvRV9LBMWEQ+ZWQkqOdqK1ldsC+gyUXqLlVQTPH0BHA7mdu2sduId8SAW3H9aCm qFmsiiTnS+fvk8Jv8C1rlZ8sxD7KTapWGpEDedbg7h31jw9GYnONqLZTge1xLbzHX2 o3OVukaYWdF7WkhoQOiuEc9muxD3YRfHO+FhWDD7DOtjXSjuRg3+WRjxlwdH3p3LNE pql0COKbli3mQ== Received: (nullmailer pid 3245828 invoked by uid 1000); Mon, 09 Oct 2023 21:14:11 -0000 From: Rob Herring To: Support Opensource , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org Subject: [PATCH] regulator: da9121: Use i2c_get_match_data() Date: Mon, 9 Oct 2023 16:13:38 -0500 Message-ID: <20231009211356.3242037-8-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