From patchwork Mon Aug 28 17:48:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3495204vqm; Mon, 28 Aug 2023 11:04:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGsLISFZ9/bHSkGtQPDXNNNkJmUdC1yYtlefOIjRp2POCKg05P37bIbAja8XGuS4rwCT/mL X-Received: by 2002:a2e:2c05:0:b0:2b6:e618:b5a0 with SMTP id s5-20020a2e2c05000000b002b6e618b5a0mr20327050ljs.6.1693245860275; Mon, 28 Aug 2023 11:04:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693245860; cv=none; d=google.com; s=arc-20160816; b=fOrjF92GmEdHz5EyV01CHeqaKBE5fXgd0nDmWtk/M54dFegpCJztL+mra/QRxl9K/J 1IA/cSSOCFy6lmzjX9any6UI9kGkOWp6kFRzF+i5k1kFE1yyjoHcu4e4tzR0Pg2EPGQs /Suv2VABQ0d1N8BpMEDpddBBmgMnhVli0y0OYf9aMteeDwJ8kFQLWdziVGcRBDhQBFFg okEkhmuGAKHzkmmHnWGybYM5RZZE2RtAZGeYJ1VpMZxZPfSVrCvSG7BhDx1F090TSUZk clj0VvzOXd1uQYtXWv4hS9JJ53TfcPMCs/hPCMp441YmQHuv6y/InoZLBo6ZNhwPQQGu 8Thg== 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=ew1LVsa85Y9wOZVjp3jz4OobhZnTNapZG7OwokiEHEI=; fh=wpUSlXqQV0qTbRFKSYn/IHeNnaORdR3F84N8s0QUNwU=; b=bVvXU1XcU0TxmwTJo3UgvudBPSUWsAM2LLHJzThfX/rEgiKPuPY6A5kQrL52j0ohvD XcWxLHsj4gv+jri6cqgF/vPL52pqnOjOgKU0sXcRuRrBNujsKcL8TLf32hitIm2eKkWt vcavPomlboaINVmK2SbWDtRM1UnpGmg6qB01xxJsvlQHn0HqVdTHi3QWDKNQrEiYxWrh ALkWeCPU1zPtiaYDSatPUoAJYrrmRqB2IyGePq2Ye2M8K2Ut77vHa4nXsDEhUttHte54 xuZP2bXnFG9uap1JgRT0SLEsmzmBJRHopVplOugmM5Fq2niF8m6UXL3zvScR69EqhyQr ywuA== 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 us11-20020a170906bfcb00b009a0d5192b08si4631752ejb.725.2023.08.28.11.03.28; Mon, 28 Aug 2023 11:04:20 -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 S232927AbjH1RtO (ORCPT + 99 others); Mon, 28 Aug 2023 13:49:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232993AbjH1RtG (ORCPT ); Mon, 28 Aug 2023 13:49:06 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8442A12E for ; Mon, 28 Aug 2023 10:49:03 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,208,1688396400"; d="scan'208";a="174236471" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 29 Aug 2023 02:49:02 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id D72F34048F0A; Tue, 29 Aug 2023 02:48:58 +0900 (JST) From: Biju Das To: James Schulman , David Rhodes , Richard Fitzgerald , Jaroslav Kysela , Takashi Iwai Cc: Biju Das , Liam Girdwood , Mark Brown , alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Andy Shevchenko , Charles Keepax Subject: [PATCH v2] ASoC: cs42xx8-i2c: Simplify probe() Date: Mon, 28 Aug 2023 18:48:56 +0100 Message-Id: <20230828174856.122559-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: 1775496970775584697 X-GMAIL-MSGID: 1775496970775584697 Simplify probe() by replacing of_match_device->i2c_get_match_data() and extend matching support for ID table. Also replace dev_err()->dev_err_probe() to simplify the code. Signed-off-by: Biju Das Acked-by: Charles Keepax --- Note: This patch is only compile tested. v1->v2: * Added Ack from Charles Keepax. * Restored the error EINVAL. --- sound/soc/codecs/cs42xx8-i2c.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c index a422472820fb..9028c0f0fe77 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -18,21 +18,15 @@ #include "cs42xx8.h" -static const struct of_device_id cs42xx8_of_match[]; - static int cs42xx8_i2c_probe(struct i2c_client *i2c) { int ret; struct cs42xx8_driver_data *drvdata; - const struct of_device_id *of_id; - - of_id = of_match_device(cs42xx8_of_match, &i2c->dev); - if (!of_id) { - dev_err(&i2c->dev, "failed to find driver data\n"); - return -EINVAL; - } - drvdata = (struct cs42xx8_driver_data *)of_id->data; + drvdata = (struct cs42xx8_driver_data *)i2c_get_match_data(i2c); + if (!drvdata) + return dev_err_probe(&i2c->dev, -EINVAL, + "failed to find driver data\n"); ret = cs42xx8_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config), drvdata);