From patchwork Mon Aug 28 15:38:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137049 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3439161vqm; Mon, 28 Aug 2023 09:22:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdZpj2GgQw2gRFkT7Pk0qdqWB6FZEu6ddf7J4ljnLj+lsyyF7hzYBGZ2zGl3cUKF1YIZLS X-Received: by 2002:a17:90b:3ec8:b0:268:1b62:2f6c with SMTP id rm8-20020a17090b3ec800b002681b622f6cmr25139810pjb.2.1693239779539; Mon, 28 Aug 2023 09:22:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693239779; cv=none; d=google.com; s=arc-20160816; b=YWA3h2lq7xwG94GRUMe7eAQz+boj3dD3u3cFn1eyUmfQClc/JHPlbtnyMl3hLEmLFJ xGsEYRM3uOFxPuuXTcUrjSRrDC1vAI+/u2WE3AHR/NmM/D3zI3BgvOGn0eDM8Jb6taLi dkNAkczJsy8oPxHwxmGfoKwCdUpLRG4+EBMguRXv81zSSwsjmEEpYgNOwiDKPsQ/uh0j d1V3yymTAV7EEqLD4Po9xVeczz2/0Y++l2KDzHjhUoZcUX6NG780Ti+KiZl7W5jypwEx NXn8zYSkm/BI9cdYF0XdLJaBIea9Y0c4ZZnvsGQY9lTb7d8X7GGt2KzqtwYGt2MJSEI/ bfaQ== 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=cRLOKcf2T5fwiDic8i3OqaX9t+/u70egiK+DwXK8THM=; fh=uHUQMY3ScCCKFoIkA2KaGBsmege9T5JuhXIcbF/hmCs=; b=d6W0+RCFKJT4kaSuql5std+/tWA7G1LUHHrd6hvXJrugs3ktdHZWelmhVjpFkf4Nzk dqbSrNd3531ZhH2xiDmKBm49MuOhsyPaqDrRjVvVF6U8aQGbPiyPgEOyp5/qLiHJ5vQy PG4xGhbDHn7ftwQJq62zaDTOFL9NPvEfNZe2b99/ATtkAtSwFIQmhJnvNn2nwOTMlTU2 XRQC3xkHRCiE8GI8zKGYImV6aRzpSPnyL9ByBHNr25t9j/U2s91aDI0i2rHMRsz1PyrG rk0ljedCCCfzXR/hUZQmpRhPQohlQBPU6DrmaFEosDLxGV0j1WeaTt9AnAPPF6MWzah2 GvJw== 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 l10-20020a17090a72ca00b00262d1b39524si7893870pjk.116.2023.08.28.09.22.32; Mon, 28 Aug 2023 09:22:59 -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 S232225AbjH1Pik (ORCPT + 99 others); Mon, 28 Aug 2023 11:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232358AbjH1PiQ (ORCPT ); Mon, 28 Aug 2023 11:38:16 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 391AB102 for ; Mon, 28 Aug 2023 08:38:13 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,207,1688396400"; d="scan'208";a="174228938" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 29 Aug 2023 00:38:12 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 3BC91400A677; Tue, 29 Aug 2023 00:38:10 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2] mfd: max77541: Simplify probe() Date: Mon, 28 Aug 2023 16:38:05 +0100 Message-Id: <20230828153805.78421-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: 1775490595066477629 X-GMAIL-MSGID: 1775490595066477629 Simplify probe() by replacing device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). While at it, drop leading commas from OF table. Signed-off-by: Biju Das --- v1->v2: * Restored error code -EINVAL. --- drivers/mfd/max77541.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/mfd/max77541.c b/drivers/mfd/max77541.c index 10c2e274b4af..2d50444a7b96 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; @@ -190,14 +186,8 @@ static int max77541_probe(struct i2c_client *client) } static const struct of_device_id max77541_of_id[] = { - { - .compatible = "adi,max77540", - .data = (void *)MAX77540, - }, - { - .compatible = "adi,max77541", - .data = (void *)MAX77541, - }, + { .compatible = "adi,max77540", .data = (void *)MAX77540 }, + { .compatible = "adi,max77541", .data = (void *)MAX77541 }, { } }; MODULE_DEVICE_TABLE(of, max77541_of_id);