From patchwork Thu Aug 31 20:47:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137354 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c792:0:b0:3f2:4152:657d with SMTP id b18csp533542vqu; Thu, 31 Aug 2023 15:21:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGkVxyR6flBXHy5zN+M8cUuyTtFBfLitsiuFsb7isfB2ZCyXIbu5X7Q/SwQ0ihgFr7KLSh X-Received: by 2002:a05:6a00:2d29:b0:68a:582b:6b62 with SMTP id fa41-20020a056a002d2900b0068a582b6b62mr1041972pfb.7.1693520482478; Thu, 31 Aug 2023 15:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693520482; cv=none; d=google.com; s=arc-20160816; b=Dk6xYj4j5iyz6vnNleOEvWv0ZqzkYx+bIMBZc2QgzP1ho9R/CTXUEoZd13fviYSRCF OPqdw3kfa385/aSTOp5w2z7KdYMGd8jOxvqFQ4fkUKi35DlrHdjZOrTR0oH67y3MtsqI Z0boZkgUR2dcj110gJy4IegmKuYMMbcqpWPS0ss8yWt3c/C06Rey0V6zhqW/WuwDokYI 7dNXxBcq49jnS088Vep6Rx/Kwubblf3YwrgvoYCm2r8WLDhD4AxuU0KCyP0TmxGeYpdZ dY+emSwZTHoIodXQnOXE+uraiQ61Z8MLOhRCbRSmBmDe7yDtPUda3Zul8tRHPwbAs4YK D9Ug== 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=iLztAh1hfWrwHRJctk9Iha15QdaegXiZLMrWYdvZHBY=; fh=TuYOsclT2+Y56rXH3knQ9yzreL+Q66+Rs2eHdbNC+ss=; b=qC/MwElDuKKaBbkIX/4bIWOzud3Vl/CxN1OSMnuhtkK9KS9ZAIwZmxmkM3NYfQnuRj nQIzO+W63EvEnQQNgjjY4tiim0c/9Md/qUGqNcNMpKEK0kJmlSOkCVVirluOSv30h13F zmvRCwVBeA+ksDzBJtLuGuombRlku3mvX6fcijIsaGwVTc37Nx+/rFXGsK1tIHdbsctq cV1WN1KNOaPXdYc721FbBOj8qhj/9TtfGuJQ0zJAVtlE5ZAPBXt2+1SQVIlhuCD+/iOn dbC1b/cYf3EILD9bcoVao6LgWIgNx7VRx4ogangR5NCp1rLho7VNPMK2ijcVjPikpGoE jsCA== 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 l190-20020a6391c7000000b005404f8dd0easi1830075pge.292.2023.08.31.15.20.14; Thu, 31 Aug 2023 15:21:22 -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 S1345543AbjHaUrt (ORCPT + 99 others); Thu, 31 Aug 2023 16:47:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231715AbjHaUrr (ORCPT ); Thu, 31 Aug 2023 16:47:47 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AAE04CFE for ; Thu, 31 Aug 2023 13:47:43 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,217,1688396400"; d="scan'208";a="174635229" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 01 Sep 2023 05:47:43 +0900 Received: from localhost.localdomain (unknown [10.226.92.179]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 474AB402951B; Fri, 1 Sep 2023 05:47:40 +0900 (JST) From: Biju Das To: Jaroslav Kysela , Takashi Iwai Cc: Biju Das , Liam Girdwood , Mark Brown , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v3 1/2] ASoC: ak4642: Minor cleanups in probe() Date: Thu, 31 Aug 2023 21:47:33 +0100 Message-Id: <20230831204734.104954-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831204734.104954-1-biju.das.jz@bp.renesas.com> References: <20230831204734.104954-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=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: 1775784933461693926 X-GMAIL-MSGID: 1775784933461693926 Some minor cleanups: Replace local variable np with dev_fwnode() Replace dev_err()->dev_err_probe(). Remove comma in the terminator entry for OF table. Drop a space in the terminator entry for ID table. Signed-off-by: Biju Das --- v3: * New patch. --- sound/soc/codecs/ak4642.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 2a8984c1fa9c..901014909c0f 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -633,13 +633,12 @@ static const struct i2c_device_id ak4642_i2c_id[]; static int ak4642_i2c_probe(struct i2c_client *i2c) { struct device *dev = &i2c->dev; - struct device_node *np = dev->of_node; const struct ak4642_drvdata *drvdata = NULL; struct regmap *regmap; struct ak4642_priv *priv; struct clk *mcko = NULL; - if (np) { + if (dev_fwnode(dev)) { const struct of_device_id *of_id; mcko = ak4642_of_parse_mcko(dev); @@ -655,10 +654,8 @@ static int ak4642_i2c_probe(struct i2c_client *i2c) drvdata = (const struct ak4642_drvdata *)id->driver_data; } - if (!drvdata) { - dev_err(dev, "Unknown device type\n"); - return -EINVAL; - } + if (!drvdata) + return dev_err_probe(dev, -EINVAL, "Unknown device type\n"); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -681,7 +678,7 @@ static const struct of_device_id ak4642_of_match[] = { { .compatible = "asahi-kasei,ak4642", .data = &ak4642_drvdata}, { .compatible = "asahi-kasei,ak4643", .data = &ak4643_drvdata}, { .compatible = "asahi-kasei,ak4648", .data = &ak4648_drvdata}, - {}, + {} }; MODULE_DEVICE_TABLE(of, ak4642_of_match); @@ -689,7 +686,7 @@ static const struct i2c_device_id ak4642_i2c_id[] = { { "ak4642", (kernel_ulong_t)&ak4642_drvdata }, { "ak4643", (kernel_ulong_t)&ak4643_drvdata }, { "ak4648", (kernel_ulong_t)&ak4648_drvdata }, - { } + {} }; MODULE_DEVICE_TABLE(i2c, ak4642_i2c_id);