From patchwork Sat Sep 23 17:49:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 143969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp303158vqu; Sat, 23 Sep 2023 10:50:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH72ojuFGfHrtKv8Ex+rVCm3/c//LMgJDKbeFhrteLQQDHuqbRIFKHhWZ7MSPuDUgiEvVkX X-Received: by 2002:a05:6870:c14b:b0:1d0:f067:bf23 with SMTP id g11-20020a056870c14b00b001d0f067bf23mr3445645oad.25.1695491402446; Sat, 23 Sep 2023 10:50:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695491402; cv=none; d=google.com; s=arc-20160816; b=RDFupd1vnMmsDjh4nqGOaz9rndWlrgCTcq0BzF/S1TeGTtHhyMezHY9uil5ncZBj3/ DnG6bGeqhlWo1qxDsDce3Zr8ftqDcq8WThSNmph3M2gxemY37pc4C14XQwvPggA7ILZF czQqs1Jq2YcwlxQlGCyIikLHQnP5Xe7fdvfGhjgkAgPyXSCc98KAQnozMDjjnDBoRcbC HnKvZyn+GQhJuqgd+jwHQmfNd4SmmEM6K7xxU3J7UNvYgfmtbHpGPYdjM/8fs0qOhTuA BfcKYmtyltXerArQ+1k827I8vZ5CmzwcWUWGQU95bQ9LSzX6v+TkStOSuJjKRDyAp6Jl D8cg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Cz/cDrQEcfC24KkKX794rkamU74WF1+qDJPII1Lzajc=; fh=pw+dqyfPdSov6fSSng5jSNKgho3EaeZzx+IVU5xkcn4=; b=yjWOCSnVMSn0GU9F8quDObhuWZCK917wy9S/KRgXxuDVmGJdOzI3lcZpmH49njcrDJ Z22wE19/B7K7/nVf+PHEwTKEOcHKDZz4jCgKRLmgLjD6WWUULbhClwxHAXFUoUHatb2A xQCLq+mIEypay0eVZPz1joHwclRDjnQFM63wYXLlcSsaHkvNnw/1l4OP29AaYJo9NeOC 4G/ZibUpJ/5ysOW33pXHMe6XakPnHmmxDNOGQT+KcuyZ6NOvZJuWYIg3C4mRus+JWrdR lmqcUOCYMlzZPlhvZJd4iHUSDbdukYJZl8QiuHq4JTM3CWw3dwom+My6c1LT02qTY/V0 Xpzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b5-20020a633405000000b005775302b11csi3253848pga.81.2023.09.23.10.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 10:50:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 31DAD802F19A; Sat, 23 Sep 2023 10:50:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232220AbjIWRuB (ORCPT + 30 others); Sat, 23 Sep 2023 13:50:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232164AbjIWRtv (ORCPT ); Sat, 23 Sep 2023 13:49:51 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E7D4E136 for ; Sat, 23 Sep 2023 10:49:44 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,171,1694703600"; d="scan'208";a="176997674" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 24 Sep 2023 02:49:44 +0900 Received: from localhost.localdomain (unknown [10.226.92.12]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id EC22740061B8; Sun, 24 Sep 2023 02:49:42 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v4 4/4] mfd: max8998: Simplify obtaining I2C match data and drop max8998_i2c_get_driver_data() Date: Sat, 23 Sep 2023 18:49:28 +0100 Message-Id: <20230923174928.56824-5-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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 23 Sep 2023 10:50:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777851592847962053 X-GMAIL-MSGID: 1777851592847962053 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. v3->v4: * Updated commit header. 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; } -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;