From patchwork Mon Aug 28 16:06:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137066 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3478603vqm; Mon, 28 Aug 2023 10:31:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRpkO+N5nxI8iPfPhOhI5JU0LDHsDQaTCpoQ2vQzCy2c+qheRNzQd8QZn1Mpmhf/ue4Omy X-Received: by 2002:a05:6870:4395:b0:1b0:3637:2bbe with SMTP id r21-20020a056870439500b001b036372bbemr14174489oah.54.1693243877162; Mon, 28 Aug 2023 10:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693243877; cv=none; d=google.com; s=arc-20160816; b=wgqNmzOza4SFpKSyBgDsh6mmF4pnd2b2vX6yw/E2StUheFbWikeUm3Uaws4M1QpYQc Z54j/d2c7oLOXGdB9Q2itTAB8BifOqPyqubTt96OCvUqv2h6SWGRvj9XG8hezl+jnhWN sbT9PT+5HW90v5NI398b1agxiMuAMpcEN4vBd0lYnRSsLpyR0RUfycizx/LTA+ArjNYy 2cwPF4zoAFVEIq2/lmOg2IMnKM6iIWEk5+WfYM1kCg1l7dJiZ4EpbaT/6vu9EQIqPLW3 VSS/K4Br27e6X7GjRDDVr5fpNt0nkDtT55oSL6J8AQqm4xwJ5NWSuZrej7t5byz372FC YT6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=mS2SFltJfgY0eXNnWfXy3R0lcm6AW6twKDa1/UyvpaI=; fh=uHUQMY3ScCCKFoIkA2KaGBsmege9T5JuhXIcbF/hmCs=; b=aEFl8sMXXKndgh1KLwZPMLi7CZxY/KpQCGgNCpiBpIEiXb8osdLsWmi8V+gNhcA2RM Vh+MLOV1KENAGm1f1ZiAiAfndBWhIPWvaBz2zbJicLicvJdpSw3qt/AtIHmrgoVgnjJA TSqYjLSxpwG9/ZhUt+i8lDVqiEppB/iUPg63FwddWqF8vEOsTJi+U9ZOIHvL/6CM0DFz NFm+WmzcCcerTyXLryC/Lgy5hk5twDOlrrYoCVw575gxPgJ8A6l/wk0e1lb4Zn6YtuDt UXksaauzcBsIgN44ChWrgdWODBlbkPzcKwnxUMKD2I7YqJ5F7us4yHMEfMRVPfhtKo50 vNUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g187-20020a636bc4000000b00565e6b65a14si7243106pgc.70.2023.08.28.10.30.54; Mon, 28 Aug 2023 10:31:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232661AbjH1QHX (ORCPT + 99 others); Mon, 28 Aug 2023 12:07:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232666AbjH1QHE (ORCPT ); Mon, 28 Aug 2023 12:07:04 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 809AD11A for ; Mon, 28 Aug 2023 09:07:02 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,207,1688396400"; d="scan'208";a="177938453" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 29 Aug 2023 01:07:01 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 9B42D400A899; Tue, 29 Aug 2023 01:07:00 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2] mfd: max8998: Simplify probe() and drop max8998_i2c_get_driver_data() Date: Mon, 28 Aug 2023 17:06:57 +0100 Message-Id: <20230828160657.94785-1-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=AC_FROM_MANY_DOTS,BAYES_00, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775494891824556806 X-GMAIL-MSGID: 1775494891824556806 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 --- Note: This patch is only compile tested. 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; } -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 = i2c_client_get_device_id(i2c); struct max8998_platform_data *pdata = dev_get_platdata(&i2c->dev); struct max8998_dev *max8998; int ret = 0; @@ -183,7 +173,7 @@ static int max8998_i2c_probe(struct i2c_client *i2c) max8998->dev = &i2c->dev; max8998->i2c = i2c; max8998->irq = i2c->irq; - max8998->type = max8998_i2c_get_driver_data(i2c, id); + max8998->type = (uintptr_t)i2c_get_match_data(i2c); max8998->pdata = pdata; if (pdata) { max8998->ono = pdata->ono;