From patchwork Mon Aug 28 19:10:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137083 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3559675vqm; Mon, 28 Aug 2023 13:18:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEtbEzl73AaDVxYGYzh9pRbkTMfif3R7YctHFCOXgCYMCffXrJvRA5S4ta0If9c8BnxsvE X-Received: by 2002:a17:907:6e90:b0:9a1:c35b:9e09 with SMTP id sh16-20020a1709076e9000b009a1c35b9e09mr870170ejc.8.1693253918729; Mon, 28 Aug 2023 13:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693253918; cv=none; d=google.com; s=arc-20160816; b=zKWPVzaSR1YG1tvBfDLf95RxWNSp68k+ksc1u0Bvpbx+3iSOiIe5QzDHREI13PReqH DQLzlmLL+RitpNgaz0j1eRk22AlPWJ4HczbY93imcQ/6g2GYRzUgOgWMBS8AUc8Ac3O5 SwCrrTvEIU+UgsE7zEhhXHNn60CjXFCjerOQdKqDU0adlLVi9xbgUJlG2W6Pt7zWV8ME qf2875eFlFKsVA5z0vcZAsGhHX6Gx2FmWb9ISUk5WkCAL3BQfvsTqPM8NmK223AMCYxE uLFR28PvTKUB3A/tNu11NAUpnrSy6sQ0toJ5320jE0D02a+R652g0jT9PoV5ARmVTvP6 FTmw== 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=3vXaM2Ug9HkhpSd1VwSSnhmozc+Zlx5Gj5/o14JMxzo=; fh=isro4ohP5UEoi6J58tTnBJC846N0ifuc0XKNYyi01B4=; b=KHlP+8SukiPDetOidTc2Au6XaDg6Zog1X9aTSe4ds/W49bsPxMi/cLVEdq1XFTyS63 steZ2n/Vw90kAGo+XxbxhJRGDgYbArQCdHhc7WV+Vng6nbQxTOuJaulvTrmiGYXcLsWt BPqGoedQofqRhNjqfNCXe4vSZLOQA0FyfrzTa08qQPqA2mKAW1AU1WwPv5B1Dw4R1YfG h9Vmpi4EaOe6mBZyAKJhOwUqWuac9ugo7gUpfrQc59YeYORelA+7YJzlWaPVFu1sl9oH 4wirDWtrEHcbrDXS4vGUcgwOLNCTLtrBIgxTywz3RHzUVOQUcqZCqtgZkvBzKHjwS/Up kuHA== 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 dc23-20020a170906c7d700b009882f2a8aabsi4742318ejb.551.2023.08.28.13.18.00; Mon, 28 Aug 2023 13:18:38 -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 S233288AbjH1TKk (ORCPT + 99 others); Mon, 28 Aug 2023 15:10:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233298AbjH1TKb (ORCPT ); Mon, 28 Aug 2023 15:10:31 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7289EE0 for ; Mon, 28 Aug 2023 12:10:29 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,208,1688396400"; d="scan'208";a="174239901" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 29 Aug 2023 04:10:28 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 92B284055156; Tue, 29 Aug 2023 04:10:25 +0900 (JST) From: Biju Das To: Shenghao Ding , Kevin Lu , Baojun Xu , Jaroslav Kysela , Takashi Iwai Cc: Biju Das , Liam Girdwood , Mark Brown , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2 2/2] ASoC: tlv320aic32x4-i2c: Simplify probe() Date: Mon, 28 Aug 2023 20:10:14 +0100 Message-Id: <20230828191014.138310-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230828191014.138310-1-biju.das.jz@bp.renesas.com> References: <20230828191014.138310-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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775505420745399604 X-GMAIL-MSGID: 1775505420745399604 Simplify probe() by replacing of_match_node() and i2c_match_id() with i2c_get_match_data(). Signed-off-by: Biju Das --- v1->v2: * Return value of i2c_get_match_data() passed to type paramemter in aic32x4_probe(). --- sound/soc/codecs/tlv320aic32x4-i2c.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4-i2c.c b/sound/soc/codecs/tlv320aic32x4-i2c.c index 713f3f63b5e3..b27b5ae1e4b2 100644 --- a/sound/soc/codecs/tlv320aic32x4-i2c.c +++ b/sound/soc/codecs/tlv320aic32x4-i2c.c @@ -16,9 +16,6 @@ #include "tlv320aic32x4.h" -static const struct of_device_id aic32x4_of_id[]; -static const struct i2c_device_id aic32x4_i2c_id[]; - static int aic32x4_i2c_probe(struct i2c_client *i2c) { struct regmap *regmap; @@ -30,18 +27,7 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c) config.val_bits = 8; regmap = devm_regmap_init_i2c(i2c, &config); - - if (i2c->dev.of_node) { - const struct of_device_id *oid; - - oid = of_match_node(aic32x4_of_id, i2c->dev.of_node); - type = (uintptr_t)oid->data; - } else { - const struct i2c_device_id *id; - - id = i2c_match_id(aic32x4_i2c_id, i2c); - type = id->driver_data; - } + type = (uintptr_t)i2c_get_match_data(i2c); return aic32x4_probe(&i2c->dev, regmap, type); }