From patchwork Mon Aug 28 16:02:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137061 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3474858vqm; Mon, 28 Aug 2023 10:23:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbtDxhkvbOWz87FK+VoJRVZO0xVkMIXtY5NSZb4hWW2nf9izlXQoVKs2UN1JVY8usJZ9CV X-Received: by 2002:a05:6808:1522:b0:3a7:83f6:9d19 with SMTP id u34-20020a056808152200b003a783f69d19mr13770561oiw.51.1693243410372; Mon, 28 Aug 2023 10:23:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693243410; cv=none; d=google.com; s=arc-20160816; b=qUQc1SYGLwF3Ltgo1K4a/KZtBzhWdDklus0QjDovd9UCIg/ZXz913pbJaLQPXR8Rqg lETIeb+ecqKpuv2YqiXwFB/vD9jhwWNbxrDNaN4SQu+1z8E+2vE8aNP5YEMN6NUmZX5w fxbGVXvw6n8GTAwoBqUIS8GE2A+VWBQzcC/yhZDwf0/0aVstyRp22OMP0tkpA6GTl86b 0RoX2N2/BubfXpnhQ4+GDAJXQyV6QEZF8CUh/ZZIwf3OXQp2xls/xdmT2DZZ26kzRyQG ntV5X2vKYfix2vmYoi44aMz7TS4W/BjnVcwz22Xd93AqKfpHBAYXksY+oOridWGp49j+ D+uA== 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=c0eYRHblwYiogwLRhjT5iKeB7xHdm7ibLsrNjMZwxxQ=; fh=uHUQMY3ScCCKFoIkA2KaGBsmege9T5JuhXIcbF/hmCs=; b=OHPL6ba0YWxVPxY3nwSqoO7aX+wvl+/XmUUzSbV/17s2XUQFnVmLkWmtwbto5KulbR RHWwB20KGkpxRN8QEKsbkqBjW0n8tDpJpeqk0xva4cy7XMutn+xF+b6jPUIt0hEYtMTN DCSZeOXBzhHwWE7y7JX45LSpNck7iwHbpX3nV5rEcqnzkMVavVV7ZS+ylpA1V/wIitMg u07QzLz0Nt3wjuUTBTOyWX8uX+gJGcV4gZc/seF08jKHM8qNCdZ3EFnZAEuOBRBvtlyN xLLy8Pf+Psgpa1jLbxuzIuUpYOBuKEjcq45ZvUg1qVm4YywR1z2At1HmEpie8wK/Y3Kj MX0Q== 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 q27-20020a63751b000000b0056c0e3c77f7si7927127pgc.805.2023.08.28.10.23.06; Mon, 28 Aug 2023 10:23:30 -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 S230003AbjH1QDF (ORCPT + 99 others); Mon, 28 Aug 2023 12:03:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231266AbjH1QCe (ORCPT ); Mon, 28 Aug 2023 12:02:34 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AAA71186 for ; Mon, 28 Aug 2023 09:02:29 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,207,1688396400"; d="scan'208";a="177938137" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 29 Aug 2023 01:02:29 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 6BBB3400A899; Tue, 29 Aug 2023 01:02:27 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2] mfd: max8997: Simplify probe() and drop max8997_i2c_get_driver_data() Date: Mon, 28 Aug 2023 17:02:24 +0100 Message-Id: <20230828160224.92037-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: 1775494402138638033 X-GMAIL-MSGID: 1775494402138638033 Simplify probe() by using i2c_get_match_data() instead of max8997_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/max8997.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index 110bef71f208..ffe96b40368e 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -142,18 +142,8 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( return pd; } -static inline unsigned long max8997_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 max8997_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct max8997_dev *max8997; struct max8997_platform_data *pdata = dev_get_platdata(&i2c->dev); int ret = 0; @@ -166,7 +156,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c) i2c_set_clientdata(i2c, max8997); max8997->dev = &i2c->dev; max8997->i2c = i2c; - max8997->type = max8997_i2c_get_driver_data(i2c, id); + max8997->type = (uintptr_t)i2c_get_match_data(i2c); max8997->irq = i2c->irq; if (IS_ENABLED(CONFIG_OF) && max8997->dev->of_node) {