From patchwork Sat Sep 23 17:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 143970 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp303178vqu; Sat, 23 Sep 2023 10:50:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEB0biWCDB878jtPK1y4Jm1VdzjMgLH/fb1/nDxeE0PXXHbUQzI/Kd8yT3DOwj7FvOphIA0 X-Received: by 2002:a05:6a00:3982:b0:690:ce36:8b00 with SMTP id fi2-20020a056a00398200b00690ce368b00mr3433410pfb.2.1695491405766; Sat, 23 Sep 2023 10:50:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695491405; cv=none; d=google.com; s=arc-20160816; b=QTjCUrcDIMeqh35O+/0MILaI9uK6jGRWdOI1waIvifoFfVZLJInLGqvLT0ufkarSbZ aG0ag/hchMINx7ouNiQiw8SzkbhYuLbcwrma2iuw5MM6rFNfONOis36JVE84jTVJoCMO kvzjjmj1+4+51B8PMcGOXE4fN7rYpFuL2OeBlBAYuv0fZV6NXpK1d/aGX+y0sgs8V1MU nAOOd5ylUMAaZkXkSbPvnwZtbiBXw8oM4jeaG+eQfa6Te6frQvi71mZXXWkmiGxd5Mgu ADxjMhkffmhyVMHHB/Vknsk8m3/jxsBEwjAF5PUhYqr/R7SZ6fYGD3yvubpJ4ex4YqIr 9Jnw== 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=ksCbcH4GuO6DEiQtdmGVjNfmTYXOU943NKdgeTRF7w4=; fh=pw+dqyfPdSov6fSSng5jSNKgho3EaeZzx+IVU5xkcn4=; b=x13T9huA4ebPOvMUxlZHiKeJbhhEzaM6MT3yDUuZrXfyHRH4SIoQXjccx1e0sOneXe ktH2UailRCh7avuSCSm6Cz8CBn4wjs4BjHQ/W/lsNoajzkdORNIux1xYmFzcdjNA1QS3 7GYh+7NCybgSB8AkflAtZaRvgF7zZSm6HbocCbQEQaF5A9Fv/Akp8cOjSnRqZypoRQ3m PFuup/4c222cN6yfckUIr3gvU0zxsFc2rmuWEb+2Op40KMor7834HQfW6fjowSCBRlwm Y+WvlODFWQhr4t7qWxaHGfAa5pJ1hasiwc8G6OQ3BjgWcq0nrSXQ8ujnqHAmNdFwNsw2 pkYg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id y6-20020a63e246000000b00570505c5267si6511331pgj.262.2023.09.23.10.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 10:50:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 4D60A82E07A7; Sat, 23 Sep 2023 10:50:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232208AbjIWRt6 (ORCPT + 30 others); Sat, 23 Sep 2023 13:49:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232132AbjIWRts (ORCPT ); Sat, 23 Sep 2023 13:49:48 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 941E6136 for ; Sat, 23 Sep 2023 10:49:42 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,171,1694703600"; d="scan'208";a="180730429" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 24 Sep 2023 02:49:42 +0900 Received: from localhost.localdomain (unknown [10.226.92.12]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 99B6340061B8; Sun, 24 Sep 2023 02:49:40 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v4 3/4] mfd: max77541: Simplify obtaining I2C match data Date: Sat, 23 Sep 2023 18:49:27 +0100 Message-Id: <20230923174928.56824-4-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=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Sat, 23 Sep 2023 10:50:03 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777851596275126283 X-GMAIL-MSGID: 1777851596275126283 Simplify probe() by replacing device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). Signed-off-by: Biju Das --- Note: This patch is only compile tested. v3->v4: * Updated commit header. v2->v3: * Restored OF table. v1->v2: * Restored error code -EINVAL. --- drivers/mfd/max77541.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mfd/max77541.c b/drivers/mfd/max77541.c index 10c2e274b4af..d77c31c86e43 100644 --- a/drivers/mfd/max77541.c +++ b/drivers/mfd/max77541.c @@ -162,7 +162,6 @@ static int max77541_pmic_setup(struct device *dev) static int max77541_probe(struct i2c_client *client) { - const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct max77541 *max77541; @@ -173,10 +172,7 @@ static int max77541_probe(struct i2c_client *client) i2c_set_clientdata(client, max77541); max77541->i2c = client; - max77541->id = (uintptr_t)device_get_match_data(dev); - if (!max77541->id) - max77541->id = (enum max7754x_ids)id->driver_data; - + max77541->id = (uintptr_t)i2c_get_match_data(client); if (!max77541->id) return -EINVAL;