From nobody Thu Dec 18 16:38:03 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 4655ECA0FE6 for ; Fri, 1 Sep 2023 06:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348375AbjIAGYG (ORCPT ); Fri, 1 Sep 2023 02:24:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbjIAGYE (ORCPT ); Fri, 1 Sep 2023 02:24:04 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 60D2910E6 for ; Thu, 31 Aug 2023 23:23:52 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,218,1688396400"; d="scan'208";a="178405245" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 01 Sep 2023 15:23:51 +0900 Received: from localhost.localdomain (unknown [10.226.92.203]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id D85C34193859; Fri, 1 Sep 2023 15:23:49 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v3 RESEND] mfd: max8998: Simplify probe() and drop max8998_i2c_get_driver_data() Date: Fri, 1 Sep 2023 07:23:44 +0100 Message-Id: <20230901062344.6089-1-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 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 using i2c_get_match_data() instead of max8998_i2c_get_driver_data() for retrieving match data from OF/ID tables. Signed-off-by: Biju Das Reviewed-by: Andy Shevchenko --- Note: This patch is only compile tested. V2->v3: * Added Rb tag from Andy. v1->v2: * Used uintptr_t for enum casting. --- drivers/mfd/max8998.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 4cc426a6c767..6ba27171da28 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -152,18 +152,8 @@ static struct max8998_platform_data *max8998_i2c_parse= _dt_pdata( return pd; } =20 -static inline unsigned long max8998_i2c_get_driver_data(struct i2c_client = *i2c, - const struct i2c_device_id *id) -{ - if (i2c->dev.of_node) - return (unsigned long)of_device_get_match_data(&i2c->dev); - - return id->driver_data; -} - static int max8998_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id =3D i2c_client_get_device_id(i2c); struct max8998_platform_data *pdata =3D dev_get_platdata(&i2c->dev); struct max8998_dev *max8998; int ret =3D 0; @@ -183,7 +173,7 @@ static int max8998_i2c_probe(struct i2c_client *i2c) max8998->dev =3D &i2c->dev; max8998->i2c =3D i2c; max8998->irq =3D i2c->irq; - max8998->type =3D max8998_i2c_get_driver_data(i2c, id); + max8998->type =3D (uintptr_t)i2c_get_match_data(i2c); max8998->pdata =3D pdata; if (pdata) { max8998->ono =3D pdata->ono; --=20 2.25.1