From patchwork Mon Aug 28 15:49:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3473428vqm; Mon, 28 Aug 2023 10:20:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfc8GYZi+8tAwf5G611RD2amhbW432hu+qdxzLny9crokY2mSbE01GVoqtBw4ZBk5q8WS4 X-Received: by 2002:a05:6358:c1d:b0:134:cb65:fbbe with SMTP id f29-20020a0563580c1d00b00134cb65fbbemr36636999rwj.13.1693243225591; Mon, 28 Aug 2023 10:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693243225; cv=none; d=google.com; s=arc-20160816; b=bIFnXF16uKZR/HZml4Tx1xm0RNDUf31XpXj9GXUEwayy8FWeuBwF9ow92EbygSpdeA Yf/NsuRkuBafRIgzWyZ2EhRhTq1f3YV5qjctOyCP9qbEHa4rByzQRutqs/LMuzTdbe8o Xti06yU5w8sCBPrUJyeNG9viD7QSwS8XXAZAcQXvqAhocN9xzC95YOw+HKH+u4ai5/X4 blx2HFkHPpPurQ9nSo/0ic3KXd5e2NkLFuumbcFa0kcTx6BcTX8gfR5v+mv2YqXxX3bI 3bvejr9CERQ37lh6vkecDUlFNjPDp33erXDDn/ib5Tc4M6icqIcErFeIs1okB2k8G7US B+2g== 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=ndYOmdui+A0nnUKaiuuwBqmH4vMUBLv7tURJzhFOSNM=; fh=zOQ6IUp2HEvN+dF3Klb6N06Rq9UuKwK0e/zxZ3PCwMI=; b=elFD8omSb0ZiKpm2iEz+PaX7Ln9CSPEaWzi48FfahVjk8+lEjsyv08xrvY4F/XAq9x Qyk4vTvXMDnH69p0SkIoqvzx9LeprZrjf/j2YIZDJxUOknCjI6mJBR1RIuqcr4DfeV/V tg9xGTCoBn/l48qnr1YBbPYXRgPBPdhYZhHBgFh53rF/tS/d2pmD+BEwxl0UDCRND35o 2koimc7TWuj29WTIazsQXNig/Ix4X6p+MTRzC2PEuaMZE8Ew59e85ZYeosZv+OfHxIve W6pTh2hrCKwFQFDVl3iXOCnyVN1sc41kk8vR/O0BYOmrYBFwnnArGrt4TAvootnXG8qN 2R6g== 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 u69-20020a638548000000b0054fe4cdd1a7si7753437pgd.716.2023.08.28.10.19.55; Mon, 28 Aug 2023 10:20:25 -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 S229637AbjH1PuF (ORCPT + 99 others); Mon, 28 Aug 2023 11:50:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230522AbjH1Ptt (ORCPT ); Mon, 28 Aug 2023 11:49:49 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 93B3EC9 for ; Mon, 28 Aug 2023 08:49:46 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,207,1688396400"; d="scan'208";a="174229477" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 29 Aug 2023 00:49:46 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 7D41D400D4B8; Tue, 29 Aug 2023 00:49:43 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , Charles Keepax , Richard Fitzgerald , alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2] mfd: madera-i2c: Simplify probe() Date: Mon, 28 Aug 2023 16:49:41 +0100 Message-Id: <20230828154941.79780-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: 1775494208417006644 X-GMAIL-MSGID: 1775494208417006644 Simplify probe() by replacing of_device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). Signed-off-by: Biju Das Acked-by: Charles Keepax --- Note: This patch is only compile tested. v1->v2: * Added Ack tag from Charles Keepax. * Dropped blank line before switch statement. --- drivers/mfd/madera-i2c.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c index a404ea26bc79..33781c631345 100644 --- a/drivers/mfd/madera-i2c.c +++ b/drivers/mfd/madera-i2c.c @@ -18,21 +18,14 @@ static int madera_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct madera *madera; const struct regmap_config *regmap_16bit_config = NULL; const struct regmap_config *regmap_32bit_config = NULL; - const void *of_data; unsigned long type; const char *name; int ret; - of_data = of_device_get_match_data(&i2c->dev); - if (of_data) - type = (unsigned long)of_data; - else - type = id->driver_data; - + type = (unsigned long)i2c_get_match_data(i2c); switch (type) { case CS47L15: if (IS_ENABLED(CONFIG_MFD_CS47L15)) {