From nobody Fri Feb 13 15:42:38 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 E8577CE7A89 for ; Sat, 23 Sep 2023 17:49:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232178AbjIWRtw (ORCPT ); Sat, 23 Sep 2023 13:49:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232199AbjIWRtn (ORCPT ); Sat, 23 Sep 2023 13:49:43 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3F385127 for ; Sat, 23 Sep 2023 10:49:37 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,171,1694703600"; d="scan'208";a="180730425" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 24 Sep 2023 02:49:36 +0900 Received: from localhost.localdomain (unknown [10.226.92.12]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 599A440061B8; Sun, 24 Sep 2023 02:49:34 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko , Charles Keepax Subject: [PATCH v4 1/4] mfd: arizona-i2c: Simplify obtaining I2C match data Date: Sat, 23 Sep 2023 18:49:25 +0100 Message-Id: <20230923174928.56824-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> References: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> 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" Simplify probe() by replacing device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). After this drop intializing the variable type. Signed-off-by: Biju Das Acked-by: Charles Keepax Tested-by: Charles Keepax --- Note: This patch is only compile tested. v3->v4: * Updated commit header and description. v2->v3: * Used uintptr_t for enum casting. v1->v2: * Added Ack and Tested-by tag from Charles Keepax * Dropped unnecessary blank line before switch statement. --- drivers/mfd/arizona-i2c.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index 9b7183ffc928..10e76fc8f12e 100644 --- a/drivers/mfd/arizona-i2c.c +++ b/drivers/mfd/arizona-i2c.c @@ -22,19 +22,12 @@ =20 static int arizona_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id =3D i2c_client_get_device_id(i2c); - const void *match_data; struct arizona *arizona; const struct regmap_config *regmap_config =3D NULL; - unsigned long type =3D 0; + unsigned long type; int ret; =20 - match_data =3D device_get_match_data(&i2c->dev); - if (match_data) - type =3D (unsigned long)match_data; - else if (id) - type =3D id->driver_data; - + type =3D (uintptr_t)i2c_get_match_data(i2c); switch (type) { case WM5102: if (IS_ENABLED(CONFIG_MFD_WM5102)) --=20 2.25.1