From patchwork Tue Dec 14 02:08:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525059 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8EFD1C433F5 for ; Tue, 14 Dec 2021 02:11:03 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 79E211685; Tue, 14 Dec 2021 03:10:11 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 79E211685 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447861; bh=+xZBtG6b0VgkwZGO4AfYJ7IOSs490JOSW2+ykhiETK8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=L5+9y2ibyN1wfK40ZiIIS0epAn7n+1LgbmtzHG5kBSm4DCFrO9Yjt3M3yP2l9IZlv rY3FsPdgVyS26zaNPdXznw+t5wSWxGBFW5VdfJpNJT0Bh5sWG8eHHlv4Pft9yNHuL2 fZcFtQUmBMSe/BWZW3IVi3n/3fLtLrU9KtEG48i4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5FFDBF80517; Tue, 14 Dec 2021 03:09:40 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CC79DF8050F; Tue, 14 Dec 2021 03:09:35 +0100 (CET) Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D71D9F800FE for ; Tue, 14 Dec 2021 03:09:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D71D9F800FE Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QvuAcOjV" Received: by mail-pg1-x533.google.com with SMTP id m15so16100088pgu.11 for ; Mon, 13 Dec 2021 18:09:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=67aAVHzQgMYaTzVoy6PRJ1eod7mleiOp7Z/MtjZ0F1c=; b=QvuAcOjVz1fq/l4yRK/e6hXTKjCSYxy+QK7xySZHcZhVM0p2LKF714U27y/lrRbYSK Uy41/eVPS/Mt0iRqv5ftQJ+RoFajFJ+ovFRsvnxtIOIE3vwgs0JWd2kG/81I7xV9B0Nx 7pGzJOjBWTqGnDNfTwVStXHczEEMAuTBNs5LFB6MjVnA/4pE4if+gIF8EGp1y/HsWgxQ mIWp+u0oeRMh0xfhzILDGo+SyV6VBj2QXmue69EzTdzdZp0KpI8Se4JW4OhM/NgOrPox J9wJW8QEcHKNZNkgXKLlHBLZUeI7+5HgS6cIlEOYpvNG1VtY2gbHIWk30M9dkjt04JF5 uKww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=67aAVHzQgMYaTzVoy6PRJ1eod7mleiOp7Z/MtjZ0F1c=; b=vTqqiUyMrcUhkJm5Ani4eMdlIJk6xHONAoJxLfTtlHqD5aoqt6z5W/1UVqIidVRu5C SJfsHuWyLuWIg0cZEm6s07DrnNwra8VAwrQ3KiEONEarFhg7Ufd/Tl3KaGGRXpCdvJvg i5FiENMKWPGrKdVF7VhuZ1B2fsV2OxAxsambtCxlCW/MvCLMGb9oTYc7tVkWOzChHKaS rb8dhGDQ2AkguvzT9/8Sgj33Z/fNV121LPdo7MfHZjWGY2OsDTJb4wgiNyOdOOsLpE+j bm09EZ3GPngkkRwVj9MH5AQNMbDr03T92p2dnodZRouepVCjNzFMawS6iBhZg0r+YFuq aEBw== X-Gm-Message-State: AOAM530nqRFRrIWS49IEVcx0ywwwyzl8+XxZZw82Pqy+dWRq/deiC425 UEZT1ahu4EMSneEPT8LYhkE= X-Google-Smtp-Source: ABdhPJwfSg775AQtbWaqex19UH1FOVC/avKlf2yC4OnmAegUr+6QzAXITaV77tZgLvmbH/64jl1Blg== X-Received: by 2002:a62:7541:0:b0:4a3:8a3b:6136 with SMTP id q62-20020a627541000000b004a38a3b6136mr1756489pfc.78.1639447763910; Mon, 13 Dec 2021 18:09:23 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:23 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 01/22] ASoC: codecs: ak4118: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:22 +0900 Message-Id: <20211214020843.2225831-2-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/ak4118.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/ak4118.c b/sound/soc/codecs/ak4118.c index e0a6451851e8..2e6bafd2a821 100644 --- a/sound/soc/codecs/ak4118.c +++ b/sound/soc/codecs/ak4118.c @@ -374,20 +374,14 @@ static int ak4118_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, ak4118); ak4118->reset = devm_gpiod_get(&i2c->dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(ak4118->reset)) { - ret = PTR_ERR(ak4118->reset); - if (ret != -EPROBE_DEFER) - dev_err(&i2c->dev, "Failed to get reset: %d\n", ret); - return ret; - } + if (IS_ERR(ak4118->reset)) + return dev_err_probe(&i2c->dev, PTR_ERR(ak4118->reset), + "Failed to get reset\n"); ak4118->irq = devm_gpiod_get(&i2c->dev, "irq", GPIOD_IN); - if (IS_ERR(ak4118->irq)) { - ret = PTR_ERR(ak4118->irq); - if (ret != -EPROBE_DEFER) - dev_err(&i2c->dev, "Failed to get IRQ: %d\n", ret); - return ret; - } + if (IS_ERR(ak4118->irq)) + return dev_err_probe(&i2c->dev, PTR_ERR(ak4118->irq), + "Failed to get IRQ\n"); ret = devm_request_threaded_irq(&i2c->dev, gpiod_to_irq(ak4118->irq), NULL, ak4118_irq_handler, From patchwork Tue Dec 14 02:08:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 527A0C433F5 for ; Tue, 14 Dec 2021 02:11:19 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 391BC1911; Tue, 14 Dec 2021 03:10:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 391BC1911 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447877; bh=1Onc+ig3iARyMMpg8u8pvYDRpPS4UnJ6+cRbGXadNnk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=dzv1TYIex2xAjy6JoX2RetdE1UDfsAx4sPBmzJaeHiK6K4Ciblr7cFe9HHcuNKrBi jtO32sc8hobCZBLyDpgMza6yCFY2nGmqJXiR05tY4m5ezRY60YJxQeYE+7depSclYm 8dBkOClccP2LiO19igrAa2+VIJz8y1CPY183VsVg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9829AF80246; Tue, 14 Dec 2021 03:09:41 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6254EF8050F; Tue, 14 Dec 2021 03:09:39 +0100 (CET) Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E515EF8013C for ; Tue, 14 Dec 2021 03:09:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E515EF8013C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AiyhwqZh" Received: by mail-pf1-x434.google.com with SMTP id i12so16575253pfd.6 for ; Mon, 13 Dec 2021 18:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NA63f95I7CMHHnhVrUkiId9dVNBdG82PEh/NR72qdp0=; b=AiyhwqZhDLyspcE2mQvS0LAkWsIyFGqp1E8HQuxyylHrChTb0R2Yc9TPtJ49FLYmWx AzTFxvPFL6DkNpMf9yVN8X5Ciicu+9ZE6QyspkQ+MwEXnWbjfNfVjDF5SR8ytEFzwlgC 43qSPGiWY5+2t+9g+La82kYS6JZaSacc/dpz+bpzW9GJAPaeTQnmb7liXQEQZeQCS2Xs e8OeHG6TTeR3s+g+eQRpSl01kFSoDqnsNaQyB+mC5uGA6MHejjC/cOl1Pr8Rqld6XmWg Vwhn28rmvOMWOupDm9rCRYqwM1sKQoJ4dsEOKKRlGoCfSgCSR4oLIJR96Zlm4BNXyjAB 20TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NA63f95I7CMHHnhVrUkiId9dVNBdG82PEh/NR72qdp0=; b=5VMVmmONqSgh19DfqR7P8n540a9l+A/Q4Cqkit/wurLikFuo5igsw0s7/sPaoBIqT6 OV+4+cVB06j/Qno5IOujSNglByQsAuF4wyQEKbiSithG3iLkj/vCd6Hpyg5b15u8dqrw fj6lccWFLl+xsxHygNpGY1mc4sh3BpmoLkpWy4YWxyLafSGC+V3GjBdOGdiczC89JBRt 71arLljihms2IjniJu1FwSPQYzUdXlodrz02zOnwRIPyd/FnSx1Y/Vbt7RrEiGpOo2k1 SIN9I2SfU9R1VKF44oymDscHSxr7Qgaj+FQjGwhKQMYMtLoV/aeqQho7o4at+Nt3j20q 8fRg== X-Gm-Message-State: AOAM5328wni6KieuiJIOC/v+WeGS5QSHb5TKawT3iZeVKeIyCTXjwTYJ oLxrVrhrDdni3qnT4ZeYJbk= X-Google-Smtp-Source: ABdhPJzqhgwVuJvXm9FGTv5AB3oO/6HsdHa8glrhYdpkv1O9U4UUFsMEVosfBz0eiGvBEiPeAidhPg== X-Received: by 2002:a05:6a00:8cf:b0:4a8:3ae:1a78 with SMTP id s15-20020a056a0008cf00b004a803ae1a78mr1735617pfu.7.1639447765370; Mon, 13 Dec 2021 18:09:25 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:25 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 02/22] ASoC: codecs: es7241: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:23 +0900 Message-Id: <20211214020843.2225831-3-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/es7241.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/es7241.c b/sound/soc/codecs/es7241.c index 2344a0b03518..9f20bfb855b3 100644 --- a/sound/soc/codecs/es7241.c +++ b/sound/soc/codecs/es7241.c @@ -255,7 +255,6 @@ static int es7241_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct es7241_data *priv; - int err; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -271,28 +270,19 @@ static int es7241_probe(struct platform_device *pdev) es7241_parse_fmt(dev, priv); priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(priv->reset)) { - err = PTR_ERR(priv->reset); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'reset' gpio: %d", err); - return err; - } + if (IS_ERR(priv->reset)) + return dev_err_probe(dev, PTR_ERR(priv->reset), + "Failed to get 'reset' gpio"); priv->m0 = devm_gpiod_get_optional(dev, "m0", GPIOD_OUT_LOW); - if (IS_ERR(priv->m0)) { - err = PTR_ERR(priv->m0); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'm0' gpio: %d", err); - return err; - } + if (IS_ERR(priv->m0)) + return dev_err_probe(dev, PTR_ERR(priv->m0), + "Failed to get 'm0' gpio"); priv->m1 = devm_gpiod_get_optional(dev, "m1", GPIOD_OUT_LOW); - if (IS_ERR(priv->m1)) { - err = PTR_ERR(priv->m1); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'm1' gpio: %d", err); - return err; - } + if (IS_ERR(priv->m1)) + return dev_err_probe(dev, PTR_ERR(priv->m1), + "Failed to get 'm1' gpio"); return devm_snd_soc_register_component(&pdev->dev, &es7241_component_driver, From patchwork Tue Dec 14 02:08:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525057 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 932DDC433EF for ; Tue, 14 Dec 2021 02:12:09 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CCB8D1949; Tue, 14 Dec 2021 03:11:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CCB8D1949 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447927; bh=8mENnwnLudAgiscCKuUa0a1MsnPocXpzFVl8HaH3Q4c=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=s20W8KdHKPdCGw01fJl3pmeW7Pogx5odCsLZxncpLhNeuLKto6g5eVGEmRLXTA7Vm C/SKLxy4yNbknjvtNrgnvgm7NM/jarW+jawuNKVV1p6Vnw8LlBEY0qgawvY3QWanwB NvirHPrm1Gc0PhoGRIeyq+PlNwokHuUxVMhP3G8Y= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8FB03F8052D; Tue, 14 Dec 2021 03:09:47 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1AF4AF8051F; Tue, 14 Dec 2021 03:09:43 +0100 (CET) Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A2C6BF80271 for ; Tue, 14 Dec 2021 03:09:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A2C6BF80271 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LtzqYycG" Received: by mail-pg1-x52c.google.com with SMTP id f125so16193145pgc.0 for ; Mon, 13 Dec 2021 18:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PV7a3dHfH7qP0MxYbLp/fe30OwkAoRYz0SswjQ/RoQ8=; b=LtzqYycGHXVATgijafwLOl61h9TSlzvKp8kLVKakdpMqvAXopBkNtRjpmt6ZF4aERK sR8+ATKSgMkcZMsf1Srb3VrEdlNP9+cJhi8Y0ozilGWzu/sMqcdEtOKdHYZ456IJEp14 Zb4Q8neSBFNYK3rZzL8ZZjfFelYzfK55awP3sCXW3Vj2R29UpxFsbidYg4sMEXjZ+aHt vqfSpV1C0LwXYsiG0TFdzUvYFcj2DIdRlMq+terbDIkhsUoo0zfyFfcELQVLuT3KcMh7 sb9X8cF5POYPzflbjGo/RAc5CW982rZVji/1C5OrGR6gMgDWPKUaI3El5/W89uwdHtFl 3AUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PV7a3dHfH7qP0MxYbLp/fe30OwkAoRYz0SswjQ/RoQ8=; b=TWaAX0OFSAIpCLIgYqWXfPxKg2mMxsTIguE/osFTqEgUBdGP4HEqqi5I5R5DgA07Dh GA7yp9tjxhypWAXST0GJDGwu/WlPam5JKN4X40XqZtINrEyEBsBVSOe4ISpsgXSwVdDS KiyquaNssBGgkFFtvHik+SnmMpnmzAI6opTc8ms3fQ/hn0+qdttRWz/yUng1syCjXbyE 3+v2ysRAEub7x1eo9khdwGY1CifTX4omSHON7vZE+IvB9XP0Xc9JhnHnvg6zUbwlAMIs Hrzz1GxI8wGlCREZvTT6gpIrdkzWD1qTj7mSpP7wJU5QS2ZRpLpHAF1KvzbdueC7uV+j AN+Q== X-Gm-Message-State: AOAM531McqB6rQwqulBQGb/jdf6iSIgTeoXv97ipFcdueVQvGZldBpv9 yrJOvYH02txt08lpfQCU5FX3FrgrHgo= X-Google-Smtp-Source: ABdhPJzselY3fDGD7so0ephdkpiuHmOLe15aw6P9ehm8dSnBgBK+uvBs6BJNh8BWPCgJNu/HBOj7VA== X-Received: by 2002:a05:6a00:16c6:b0:4a8:261d:6013 with SMTP id l6-20020a056a0016c600b004a8261d6013mr1740050pfc.82.1639447766777; Mon, 13 Dec 2021 18:09:26 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:26 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 03/22] ASoC: codecs: max9759: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:24 +0900 Message-Id: <20211214020843.2225831-4-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/max9759.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/max9759.c b/sound/soc/codecs/max9759.c index 00e9d4fd1651..d75fd61b9032 100644 --- a/sound/soc/codecs/max9759.c +++ b/sound/soc/codecs/max9759.c @@ -140,7 +140,6 @@ static int max9759_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct max9759 *priv; - int err; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -149,29 +148,20 @@ static int max9759_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); priv->gpiod_shutdown = devm_gpiod_get(dev, "shutdown", GPIOD_OUT_HIGH); - if (IS_ERR(priv->gpiod_shutdown)) { - err = PTR_ERR(priv->gpiod_shutdown); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'shutdown' gpio: %d", err); - return err; - } + if (IS_ERR(priv->gpiod_shutdown)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_shutdown), + "Failed to get 'shutdown' gpio"); priv->gpiod_mute = devm_gpiod_get(dev, "mute", GPIOD_OUT_HIGH); - if (IS_ERR(priv->gpiod_mute)) { - err = PTR_ERR(priv->gpiod_mute); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'mute' gpio: %d", err); - return err; - } + if (IS_ERR(priv->gpiod_mute)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_mute), + "Failed to get 'mute' gpio"); priv->is_mute = true; priv->gpiod_gain = devm_gpiod_get_array(dev, "gain", GPIOD_OUT_HIGH); - if (IS_ERR(priv->gpiod_gain)) { - err = PTR_ERR(priv->gpiod_gain); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'gain' gpios: %d", err); - return err; - } + if (IS_ERR(priv->gpiod_gain)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_gain), + "Failed to get 'gain' gpios"); priv->gain = 0; if (priv->gpiod_gain->ndescs != 2) { From patchwork Tue Dec 14 02:08:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523696 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 96F1CC433EF for ; Tue, 14 Dec 2021 02:11:49 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D2758193D; Tue, 14 Dec 2021 03:10:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D2758193D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447907; bh=JUV2k0Ac8f5CFwKyLmmzIkIuQAoPasVSt/33y4wZItI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=TAz/ZlcksZOMyaXdDGcsvQ2Ncm70SwXZrXcZ3Q7Di1T+Py0p6bgj25767oIdcERVI RualUgkhC8Kgng2YOqX02YaSddXGAwzkIB6SnphxX4YY6JM4KnK9j5jadr6k98w30C SncloB6OjPyGpUcYzkYDvSKVlWDupYM/hcbIZxkM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A786BF80526; Tue, 14 Dec 2021 03:09:44 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 003DDF8051E; Tue, 14 Dec 2021 03:09:41 +0100 (CET) Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 81032F8025A for ; Tue, 14 Dec 2021 03:09:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 81032F8025A Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bjpjzzeS" Received: by mail-pl1-x634.google.com with SMTP id u17so12497585plg.9 for ; Mon, 13 Dec 2021 18:09:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bnfUAs0V7JtpPn6OI4QrS36CkDViGktkiepn8bX3vT0=; b=bjpjzzeSxOgDTpovILWb5AC4NVhoqoF/2B4/YZVYpUALJnGa9m0LGJrw7R/JjCGl0h DJaIg+NZgzbrJVrLv19yjIKebmJqgOeGqgOFy6zEj4kthwsUkM936CmvKCR49iqa0JVO X91NhJ2s93mP8ucNA2nxhlXx+z90zIYnRVjcwcER43N0JSWow++zP+R3mLrC6Rciiv2C ER42FQMhggpDaVR900pvo5qUKc0WpSF/tOTYWATA1/SOnGOd+KwVY8/afs3jhN/3LJ8h umFavsFRogl+E5A2VqcLOs8X3yTptZOPl6WkcbOpRiJ5nlqe9g3IqhDuemFMm4ZJCXJn 9s6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bnfUAs0V7JtpPn6OI4QrS36CkDViGktkiepn8bX3vT0=; b=TbzBDTeg9u6cfMDkzNIKsRWwhZ3/iRZCjrUj1uzFrYEwH28iXGGBKWyRkq9uWzOBa9 si3RUKtysZF19v3JFkKeqss3H7jGloAPLOTlh7cfbDnv6Cmnt3PNFRpo6LpiLpQzFv/l FtytWEzQtfgiroP5rRYHMLszdmSisjW8nWU3iaHtdKVooGsv/g5aD6AM3ZEdcxhzzXCb xRdvx2q/WA7NS3qHmujy0MmfsTd0DMJEjI0Vf/octBKgPD0OaG98Ip/uWOIKr+SglzL/ QBsfDoQ7yeWJVVB2yxkurnsiiXQyo0yYPguOH+ALi0y65v5MWVxM5MFFgQslvKzX73CL QLWw== X-Gm-Message-State: AOAM533dFChw9yKcLV8rPvF6rpwqdFS2l2zvPAbCV2eNE5IpJ0VV/+S8 umoR185O4Lwqb1SOYHB0ESg= X-Google-Smtp-Source: ABdhPJzGZY+hAFiMohm0xRpF6CnN4a2EpOYUADJjYiV8hL8JrMBFyK5aD3Zsxo9u6BJKmvCJXEQbXw== X-Received: by 2002:a17:902:6acb:b0:142:76c3:d35f with SMTP id i11-20020a1709026acb00b0014276c3d35fmr2529865plt.89.1639447768169; Mon, 13 Dec 2021 18:09:28 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:27 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 04/22] ASoC: codecs: max9860: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:25 +0900 Message-Id: <20211214020843.2225831-5-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/max9860.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/max9860.c b/sound/soc/codecs/max9860.c index dd29b183ecd6..7c9686be59d9 100644 --- a/sound/soc/codecs/max9860.c +++ b/sound/soc/codecs/max9860.c @@ -606,12 +606,9 @@ static int max9860_probe(struct i2c_client *i2c) return -ENOMEM; max9860->dvddio = devm_regulator_get(dev, "DVDDIO"); - if (IS_ERR(max9860->dvddio)) { - ret = PTR_ERR(max9860->dvddio); - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to get DVDDIO supply: %d\n", ret); - return ret; - } + if (IS_ERR(max9860->dvddio)) + return dev_err_probe(dev, PTR_ERR(max9860->dvddio), + "Failed to get DVDDIO supply\n"); max9860->dvddio_nb.notifier_call = max9860_dvddio_event; @@ -643,8 +640,7 @@ static int max9860_probe(struct i2c_client *i2c) if (IS_ERR(mclk)) { ret = PTR_ERR(mclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to get MCLK: %d\n", ret); + dev_err_probe(dev, ret, "Failed to get MCLK\n"); goto err_regulator; } From patchwork Tue Dec 14 02:08:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525058 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02936C433EF for ; Tue, 14 Dec 2021 02:11:23 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1E5151932; Tue, 14 Dec 2021 03:10:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1E5151932 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447882; bh=a8xDp6otNqt9nFtyhAqeRmB0Yotd5YEWWm6ttECh1bU=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=o4CM0bu9HugMVXCCRPFqHGjpTIA1IcrPcrgIwMY5ynKhYXzKX745PzGz3SoZRRnyy riSZ/Z2fTQTgmjbOVBCUH8If8c7yufAiDyfe24AsSMBO+adJXmksDw0B7hNDxiSC9k Q+jIjH5Fn3H7kLEktVtsZq1/GwuK1bIQBrbYjqtU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 97B1EF80249; Tue, 14 Dec 2021 03:09:43 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8DB5EF8051C; Tue, 14 Dec 2021 03:09:41 +0100 (CET) Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 67FB2F80246 for ; Tue, 14 Dec 2021 03:09:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 67FB2F80246 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FHSyvx6Z" Received: by mail-pf1-x42f.google.com with SMTP id x131so16538448pfc.12 for ; Mon, 13 Dec 2021 18:09:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4GMiAc2zffga/KCdfd43WaAOAZcdnBOXgfVjwzKiIlU=; b=FHSyvx6ZDImKYKXesVCtyx8oHkJo4cg5FPUSOZEPoQL3NyPb84n2iCr8TkoCv/oIyg i14SpZzdT1t6PBoB7TYz2YvqdIcmIgSwpUYMi1w5wR6MgQPv/EnjBKTytgvAAAmYCbja KoSS4mQG3l0ct5V7S3phN4dIIS5ZZBjJOF29sC5xfMoPa1GiCLpcGL++FlaYBf7E+jeY UyrUfwMJdCXtZfxuyapzrCcwXQLP5CruEFC6RC9FBUHiXaWub2cHlBynnPtMmJKBy0un wFawsh48HAa1kZgppFyXIyybIzlkeVhQoXL1tsXeCcbhcb7a5GkQN2TAMwC2xy+z6mNS qdDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4GMiAc2zffga/KCdfd43WaAOAZcdnBOXgfVjwzKiIlU=; b=YgfZbpdMWcibCZ+sGMdSjXVy77mRx5MsMBiadfaDsitZEZ1Psr8IBE5r0xw5wZ5AIW n3p7l51a27qT1WgC10By27Fhy4Y7MQWERqiMYMC0qV/2K4o9X7bchMI+S8ltP4L79Fdg QR9r56SOw+C6NYi0fBXYln+c8Eb7OvL3uEMmEnRvGvJGtatETYS3ex82XirtrTSw+Q6+ a/LHDVj/itHXth6cd4IN5lPjG99CDvD7i11ytCQYz7+Ok+SN3dSIb5lA6CULVlq3Usk/ pqNX2y9crjVGkk0/oGAPu0DHd2TabjxGqcr5cq2pO2hs2PO9vXSrSHs7YJqTgn5j7eQ9 kjrw== X-Gm-Message-State: AOAM5335yAzfiXs5A0h7VKvO4ocdl70SbfUkFhB3RUHdBfSI7xxL2a1L OijBy53o6rue9EA6k/IkbPM= X-Google-Smtp-Source: ABdhPJxLRVfDjVWMrdoSVSydqMokrj6iA9YAGFPcbLi7YoAGXXcYIpdd0ooGJozmvgF7FLikK5k6xQ== X-Received: by 2002:a65:6a0a:: with SMTP id m10mr1742700pgu.82.1639447769644; Mon, 13 Dec 2021 18:09:29 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:29 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 05/22] ASoC: codecs: pcm3168a: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:26 +0900 Message-Id: <20211214020843.2225831-6-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/pcm3168a.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index b6fd412441a1..fdf92c8b28e1 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -751,21 +751,14 @@ int pcm3168a_probe(struct device *dev, struct regmap *regmap) pcm3168a->gpio_rst = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE); - if (IS_ERR(pcm3168a->gpio_rst)) { - ret = PTR_ERR(pcm3168a->gpio_rst); - if (ret != -EPROBE_DEFER ) - dev_err(dev, "failed to acquire RST gpio: %d\n", ret); - - return ret; - } + if (IS_ERR(pcm3168a->gpio_rst)) + return dev_err_probe(dev, PTR_ERR(pcm3168a->gpio_rst), + "failed to acquire RST gpio\n"); pcm3168a->scki = devm_clk_get(dev, "scki"); - if (IS_ERR(pcm3168a->scki)) { - ret = PTR_ERR(pcm3168a->scki); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to acquire clock 'scki': %d\n", ret); - return ret; - } + if (IS_ERR(pcm3168a->scki)) + return dev_err_probe(dev, PTR_ERR(pcm3168a->scki), + "failed to acquire clock 'scki'\n"); ret = clk_prepare_enable(pcm3168a->scki); if (ret) { @@ -781,8 +774,7 @@ int pcm3168a_probe(struct device *dev, struct regmap *regmap) ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(pcm3168a->supplies), pcm3168a->supplies); if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to request supplies: %d\n", ret); + dev_err_probe(dev, ret, "failed to request supplies\n"); goto err_clk; } From patchwork Tue Dec 14 02:08:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525056 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 78EF6C433F5 for ; Tue, 14 Dec 2021 02:12:40 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5D9E91AA5; Tue, 14 Dec 2021 03:11:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5D9E91AA5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447958; bh=AQ0dvlvQSlbFJjCocKBgZKhyGkmQXHb/i1P+2SXhkjk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Eq/8gx0/GeefGIeGBuowqAD4ia6Hw6o74QwJxU1qato0mrmcZpS2PRTnduFL460T2 YrmiaifzRpfzxuv51L3V6FOOjyQYHPBkKYFQJ6SglV8FonegwGcSUcz6B2oXMr9DAV siJZ3+h8bve8AxURH13um7HOb4A13mIHnbwsVQmo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 43F19F80537; Tue, 14 Dec 2021 03:09:51 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 76AE0F8051F; Tue, 14 Dec 2021 03:09:43 +0100 (CET) Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C1F08F8025E for ; Tue, 14 Dec 2021 03:09:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C1F08F8025E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GhzxIeFK" Received: by mail-pl1-x629.google.com with SMTP id y7so12554300plp.0 for ; Mon, 13 Dec 2021 18:09:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SBpXQEs+oH4Ppm8Ru8mfhKAnVJsRKcfqE3wHGNI1Azo=; b=GhzxIeFKXWlOcI90cA7d58ZcRE5YdCUi6tTS9RBVMJK8mj4YnevQGnzBSFlcgkvceF yvWrRqSzdj+ltcmS/5oIbwImN/TmkCYwGQgRob34fvQP+4wlTCEyNRwf1ZieCByUAACC D3VBJYZrsKlUirT/jvG5BGjJkO6Z2IHSdgoznj6KM9s+unAb0ADx5gzuPRC1v1PIEuob sr0XPWcFq1PDRnDnDP6NdJF2nL8kNG6hrSQmvPofu+GEr1+aRlWmvVqMews33arCuWFx c2k+nA96F08A3FFJ2trW+EWOdn/3TgKuvrgXDN8CXBTBvWada2+1OxhxsZqdJyeVQ9Mo c1gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SBpXQEs+oH4Ppm8Ru8mfhKAnVJsRKcfqE3wHGNI1Azo=; b=JWZMBYIij630NJ7OvVPi4EK/pHxPbAzPPUvzSQnXiWVlh7PvNVqCfOvQUGi2QKMPCj 0lY8gXYU/JQkNb6/b6fQENM9+F5si2S+GTzyJrAZWSI+cPlVHuefm8j7OwXaBWuNzfSs qvBX44Uu1d31aWhGI65Y/T6iTWyxCyra7PYnaazsoHYC6+gn7NNIodJJpqe0uaINdDmd tJ+2hYSTT0ZkvZNpG1Ctdg4R2Nn4twu1+LUuDbCpBdA11cooVkja21tQvC1xVvxSqapE WBiGTaOlg1N4HYOEJFWrGsuMYujJCn1vj3TEvQM1o9asxyZPhR2BVgJPGmhcB5/ieZXp rO4w== X-Gm-Message-State: AOAM533YKn6T2SDVViEsVHRGiW6cSLUJykkZP21AaoSDrvKrT8b4Y+SJ 0+OfxEyn/5gld+gnEyIkY0oePyvLWjg= X-Google-Smtp-Source: ABdhPJzfXLJHrMRn8QfIGrRsJ0Or4g2nP6vA73AplW8HtwJkfdpZYcTF8xad9BuRJ4AhfjBP3G1DsA== X-Received: by 2002:a17:902:e5d1:b0:141:cd4a:f318 with SMTP id u17-20020a170902e5d100b00141cd4af318mr2156741plf.47.1639447771145; Mon, 13 Dec 2021 18:09:31 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:30 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 06/22] ASoC: codecs: sgtl5000: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:27 +0900 Message-Id: <20211214020843.2225831-7-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/sgtl5000.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 97bf1f222805..8eebf27d0ea2 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1612,9 +1612,8 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, if (ret == -ENOENT) ret = -EPROBE_DEFER; - if (ret != -EPROBE_DEFER) - dev_err(&client->dev, "Failed to get mclock: %d\n", - ret); + dev_err_probe(&client->dev, ret, "Failed to get mclock\n"); + goto disable_regs; } From patchwork Tue Dec 14 02:08:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523694 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C596EC433F5 for ; Tue, 14 Dec 2021 02:13:04 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 05F3C1ABE; Tue, 14 Dec 2021 03:12:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 05F3C1ABE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447983; bh=hiLr12UPHj78i6gg0eB+iLRynMyyunmvERJdlqbH44g=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=SFFAyvo3gVQ1ODofDtshPOiLP+sv1qx6e3X70fqtWwQsBvMx3e+Fn0Ep94Xorhbf0 rkJfPqYh8Oc6/G2/FiNagyvqSbb8C+Mzch//I+kvlktIrF5DVg+Z7oy43ExIHxWjvf G2tCeXbGVqk5L5cIQBqQtw7TWw6iaMlqTgXB2AsQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6F7BFF80551; Tue, 14 Dec 2021 03:09:54 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1B01FF80536; Tue, 14 Dec 2021 03:09:48 +0100 (CET) Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C6B5AF8051D for ; Tue, 14 Dec 2021 03:09:34 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C6B5AF8051D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mk55fFzb" Received: by mail-pg1-x534.google.com with SMTP id y9so2955000pgj.5 for ; Mon, 13 Dec 2021 18:09:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4KYEUeghlc9KEDx6ZlVKM3Lnv7AnN9ZYnSgIj6VNOz8=; b=mk55fFzbWVt9mp+fbqMx8waC8txprqF6q23d3C/frj02AF90B4XvbKVIHOc3ZQzUf0 Ius6jxLIAmvNkC0TvKkxbHMdb7SX1L0MzD2FbtskOOYzGokWATi8B28uJOBncCxCAG6j QZhhJo/6CTbNC3hninu4Q1giVcpWVXcDh79VdA5aE0/NIp2xWCJcdJDm43VsqvRP7s0A gKCxRrsXGaQ2o9Ajd3ZMvzP7O2In66BEAVrJctwO3kkQdQq00rsmm5NI2LvlEt4xjeWx nVxUBPfawP45NzgAJHKUCNz2OIMEqaM38IbjtbDeZZr2g1Ffltxg+89m3ZN4QbSeC22q mEEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4KYEUeghlc9KEDx6ZlVKM3Lnv7AnN9ZYnSgIj6VNOz8=; b=qkZK4quoyVWetO1uemFXtTQC93ru4LriQpid8vMLkzD6thliUtu0LG945hjgMXASty 3ai02fJCL6jdt8NBhEqnuJNrUX0jz+E+nj1eMcR51Io1UagM3XzifeUpgStwhcWJ/QNV 81Ifj9TfQfKxVfvveLQec2VUaN7yEUHrYFKc51ijNeNwX4fzsEX6OxQ1DT0i4REUK8++ P3NVwJTEiveOvwk+fsTOLtefwQR04RabztpmmGiER9D/dlwAMZjfIfqum8WDwfMUcGrx fUkjhKQT35UQXAkxcciAqqkp+Mpz4k6gKxO5kCR7MT6XzB2oNgqzh7dTXszbuT6tstUx be3Q== X-Gm-Message-State: AOAM532S5FfukWfV20+ihXTW58gkG03XOJ+sjJY7U331oolc58tWpJ6y oEoDmibGKssfDtYBobjj8JU= X-Google-Smtp-Source: ABdhPJzrt+ZnYE5YajfbmhAPBkBFh5yC6fKdmjbg8nDgqiL7+j2IshKwABGMCj6TfYEdstHdk+o2fg== X-Received: by 2002:a65:6819:: with SMTP id l25mr1739290pgt.506.1639447772501; Mon, 13 Dec 2021 18:09:32 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:32 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 07/22] ASoC: codecs: simple-amplifier: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:28 +0900 Message-Id: <20211214020843.2225831-8-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/simple-amplifier.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/simple-amplifier.c b/sound/soc/codecs/simple-amplifier.c index b30fc1f894e1..d306c585b52b 100644 --- a/sound/soc/codecs/simple-amplifier.c +++ b/sound/soc/codecs/simple-amplifier.c @@ -69,7 +69,6 @@ static int simple_amp_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct simple_amp *priv; - int err; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (priv == NULL) @@ -78,12 +77,9 @@ static int simple_amp_probe(struct platform_device *pdev) priv->gpiod_enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW); - if (IS_ERR(priv->gpiod_enable)) { - err = PTR_ERR(priv->gpiod_enable); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'enable' gpio: %d", err); - return err; - } + if (IS_ERR(priv->gpiod_enable)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_enable), + "Failed to get 'enable' gpio"); return devm_snd_soc_register_component(dev, &simple_amp_component_driver, From patchwork Tue Dec 14 02:08:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24E6EC433EF for ; Tue, 14 Dec 2021 02:13:19 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 45BEF1ACC; Tue, 14 Dec 2021 03:12:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 45BEF1ACC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447997; bh=RHFnF8IKI5qVeoGUapYtoLWvA0kXISOQbg3j6d/NIlQ=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=MEBqoKfiKcmIULvzQ0q6YFT/awOGmbD04fLSD4L4BPHQtm6jKQ6nPbNHAYVIOU1Nq IBOCrunD+4oI0Ur3asZjpaLH1VAXv34i+NvH2VIOwBAd2XlUC3o7gjxfJ7mv32Cwb6 YFjTMJYxLpHw8MH47Zk1vNVB6Hv+N7AOrnWf6J6o= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 616E1F80553; Tue, 14 Dec 2021 03:09:55 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4B799F80535; Tue, 14 Dec 2021 03:09:48 +0100 (CET) Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BB086F8051E for ; Tue, 14 Dec 2021 03:09:37 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BB086F8051E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kUrnJpsA" Received: by mail-pf1-x432.google.com with SMTP id g18so16576132pfk.5 for ; Mon, 13 Dec 2021 18:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0m7+RV35C2IK1AeVqYynJWc44tnirqkkVx+QKmMJDV8=; b=kUrnJpsAiuoBev+UuABzlHCAdjnzCL1IMvtmaZ/c9G2I11orsEMFCZQyxBwKPwTdSk xRuXBf1h27adBAdD/2X3v/YvwzSxtaBgZn8GiNsaOf/FPonBCZmt9f3DoF5wYR4bBJHF u+4uhcTVD1ZwnMUU/pqyJH+Pcd5bs2YQYDiipoqHlNMykZu1GG9aMTVeaFGrhGuprqr2 2qXVGrW2hRTG7pBizjsn29UwLgpRnnH/7sXZ+C0pIVF7h9IRff2VFrZwFenDVn/7Aeaw VLnPuh7SZ9wOUtRVQGyy/ckHmUZSecpMHiSYgdqeV3AJiv6at1/nZ+wLyMH4ZkhcOAuI gyzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0m7+RV35C2IK1AeVqYynJWc44tnirqkkVx+QKmMJDV8=; b=GD3tbXcDYcUdKCpzBHuzlKPUf8Q8FMvGudPFgo613+2ps7W34NMJx0eeFP+LxP18O/ q3uqSLyXGLr1RKCOoqmEZgw+1cST1MloBqAKaVZ5dMmmaeEUgP0zSFkBhgByBpARqvcz ov1yQrOOW70T/MHWZQGiumopcUawju9bYjR4EFk6IY+wr3EbzKUjaVdEYmiNxthrIL+Z r7dSHVXuttW1ORJYXvg8eEFmPM/v2BZZl5a+vN57Q/ygd1Vh4FQncTEh8qybV/RvH8lF V5mJUyVGgCjfP/jAjVs/IAyvkfMDyy6SiSBBkHapar3nrttdQj7iAH9QwjZv2nc80rcL 7ebA== X-Gm-Message-State: AOAM533RH/M+FQV8cWjQe/Q4AsBIb8RZUbOSHo6iJh7vgssxlISer7wU X5z0PolE3xeIptC4DPrQT+w= X-Google-Smtp-Source: ABdhPJyWM9gcNuY05Bd8Kb7EHy4n6XhjBizleCxpM3k61dsmuvW2kjCs05HIjGQXr6AVAaeJJ9hT8g== X-Received: by 2002:a63:6c8a:: with SMTP id h132mr1728134pgc.85.1639447773996; Mon, 13 Dec 2021 18:09:33 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:33 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 08/22] ASoC: codecs: simple-mux: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:29 +0900 Message-Id: <20211214020843.2225831-9-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/simple-mux.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/simple-mux.c b/sound/soc/codecs/simple-mux.c index e0a09dadfa7c..d30c0d24d90a 100644 --- a/sound/soc/codecs/simple-mux.c +++ b/sound/soc/codecs/simple-mux.c @@ -82,7 +82,6 @@ static int simple_mux_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct simple_mux *priv; - int err; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -91,12 +90,9 @@ static int simple_mux_probe(struct platform_device *pdev) dev_set_drvdata(dev, priv); priv->gpiod_mux = devm_gpiod_get(dev, "mux", GPIOD_OUT_LOW); - if (IS_ERR(priv->gpiod_mux)) { - err = PTR_ERR(priv->gpiod_mux); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'mux' gpio: %d", err); - return err; - } + if (IS_ERR(priv->gpiod_mux)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_mux), + "Failed to get 'mux' gpio"); return devm_snd_soc_register_component(dev, &simple_mux_component_driver, NULL, 0); } From patchwork Tue Dec 14 02:08:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18D4AC433EF for ; Tue, 14 Dec 2021 02:12:21 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F21A31A9E; Tue, 14 Dec 2021 03:11:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F21A31A9E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639447939; bh=XLIZ4DusYl8K2khBezaMQicq/+6o90bAopuSI+yGXh4=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=nzJCeM/HH9skYjVIEo4pgAC7ZSS0jo93LG5tyMguJ6eegK6jOStBTFUg/ig+0D/2T 7ke5lzdufUkKq2gZeVAwaSANej1RxzAUuht1NQgcXqQxChTieLXELhRpVWdWhoLsJ+ vpd8DZJBkhYlVNIsfKyAc1fUhEy+a1O46gmyGaSY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 32559F8051E; Tue, 14 Dec 2021 03:09:50 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 68DFCF80524; Tue, 14 Dec 2021 03:09:43 +0100 (CET) Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id DF3BBF80249 for ; Tue, 14 Dec 2021 03:09:37 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DF3BBF80249 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HZNftTbv" Received: by mail-pf1-x435.google.com with SMTP id o4so16533327pfp.13 for ; Mon, 13 Dec 2021 18:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mQaC6K9YndJEdnlkbOMVQ6sAJ1uOqahAPasZDGVESNA=; b=HZNftTbvru3kRrNn68i5AFu//Kr3Sa+GB0dEwJd2eAQCB4qF6+FIs2IF8/RWQCuIDn kbRI+dKGll4zta6oYZUoX1HwTO0+XNZXRYx3KqMHR2TFCtoEkJhRJkViS0I2AVyIPqOj fHwmvB4FYp8wsowyXiDY8vncqadS5wwVLJ3dQC5hq4Cc5VJ7Xfj4isRA2QDq9osxBzXP msw2tBU5c1/szVlmX+Jl5KU4qmofbJtA1HGvwf+pvXNOXIgklO3DoPgFLCGsGZS7yBLi VbUfsKGUd9RJ2o5hDKtLPPewWvZlwdDif63G48MEnfYpLu7/OpNMzomCdUVAEfqxwqJt thBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mQaC6K9YndJEdnlkbOMVQ6sAJ1uOqahAPasZDGVESNA=; b=j0tB35imp11mSC0VjCwU+TewmarvdCnBp28zkhfkOf85iI67i3Wqrn0RYbfYNgAyNF vAuDIvcRJaOvPVfhXwaNMqEjOGJbbuM1KAYCohxCmlMoqEqyNRz5Z2SG8drhNAAi6QPl 14zKd5zEUrbfpPe6MgeWG51tYUmqMmd4lDI9ZfeWKLvJkAXlbWy+GzBGXQE1WQF605jd S3GYwJxKPJtzdQJBe8BWn3uaO94fDywUpnhIMzzYXBS5jyOPMTGv7DV821D1ylmaX8+S EXni8XaJyah7WXnqPef15JMHdSqSsin1j8qeMwxRu/lYJndlcJy3PK0YkPDnlgEqrghh 6EpA== X-Gm-Message-State: AOAM530UBBlN6Snjgb1gXQ1gMfo59Q3iDrSQjue1bXx/lLHToEIPdyPY ucTa8KB0ytQYWz7Y4AZFGMC6OlHuDZM= X-Google-Smtp-Source: ABdhPJybou3wRK2ZIewGa+Jb1EoPIeRt17B1Ae4iJ2uAahWZ8j/p2LUU5ZwIzG/+/Vd8WbjhKS9YQg== X-Received: by 2002:a05:6a00:2391:b0:4a2:cb64:2e01 with SMTP id f17-20020a056a00239100b004a2cb642e01mr1644502pfc.45.1639447775461; Mon, 13 Dec 2021 18:09:35 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:35 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 09/22] ASoC: codecs: ssm2305: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:30 +0900 Message-Id: <20211214020843.2225831-10-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/ssm2305.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/ssm2305.c b/sound/soc/codecs/ssm2305.c index 2968959c4b75..1d022643c307 100644 --- a/sound/soc/codecs/ssm2305.c +++ b/sound/soc/codecs/ssm2305.c @@ -57,7 +57,6 @@ static int ssm2305_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct ssm2305 *priv; - int err; /* Allocate the private data */ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -69,13 +68,9 @@ static int ssm2305_probe(struct platform_device *pdev) /* Get shutdown gpio */ priv->gpiod_shutdown = devm_gpiod_get(dev, "shutdown", GPIOD_OUT_LOW); - if (IS_ERR(priv->gpiod_shutdown)) { - err = PTR_ERR(priv->gpiod_shutdown); - if (err != -EPROBE_DEFER) - dev_err(dev, "Failed to get 'shutdown' gpio: %d\n", - err); - return err; - } + if (IS_ERR(priv->gpiod_shutdown)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_shutdown), + "Failed to get 'shutdown' gpio\n"); return devm_snd_soc_register_component(dev, &ssm2305_component_driver, NULL, 0); From patchwork Tue Dec 14 02:08:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84134C433FE for ; Tue, 14 Dec 2021 02:13:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A89471AE9; Tue, 14 Dec 2021 03:13:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A89471AE9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448032; bh=0TwBkDkAKZepLqwdm9ld5rQTuhjFTY4BmHG3aE8HJcY=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Luv1N3zqnbIjUWR57Zc6mndZVh4Wjs0PiENFV+VeH/4SLDpsckMOP9hRQCE3j+qrY I5EpslML1rE1kjqLTSqVkcYSkMQyPVokjRvo+IHz3fSVk/qJ/LXdmfkLU6Bw/umj7d mt4RdEl2MhIRldNUnCfkqu+aoPlH5TqbQqe1QoLg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 84028F80564; Tue, 14 Dec 2021 03:09:57 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5422CF8051E; Tue, 14 Dec 2021 03:09:49 +0100 (CET) Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BAF4FF8051C for ; Tue, 14 Dec 2021 03:09:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BAF4FF8051C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gRhrP5cP" Received: by mail-pj1-x1029.google.com with SMTP id f18-20020a17090aa79200b001ad9cb23022so14860175pjq.4 for ; Mon, 13 Dec 2021 18:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nWrNp+DLPW2444tMTP4zI8bLePOte7dVEAPpo+ddoCo=; b=gRhrP5cPDcYC2g0S9CkNvzT0aV+2ch27LUgrgA0wgAMfhDsvNbMx58Bd4L97TsUS27 RmqPGKijmnw0qu30uLHwOoI+HoAseoENyg1lBsPDAlQZ/aQIMPOJCLH4x7GsfcDVZpVt b6x1dhw+8ex0YS6rjBvCHn6ucs/dx/go98X4CDKs/4xbsE+YTSPWh6CagCNyd77sz+Oo vF7/etwNyubS6KXzg44L8Qeyai2CTBxc9A7Hw3KJiHHEErhMWjfwyVOI1XhuJsFjn8r7 nSaE4KIUcUrZn765WmXpvercmqkxrMZbzwn5CeNx9E34ho/uPfznmIHGW3W+dbcVgofb 2IlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nWrNp+DLPW2444tMTP4zI8bLePOte7dVEAPpo+ddoCo=; b=BN6WZ/XU7Ntqw6oBDS2WLrybQXNrDMVErSQzLCPOvsiidNILPhpc/MobsHcVjZ6CnA TeNVPNW1wLTnHZ7RguLHEVW39k7jI4yl454XDaAvErDEAuhoYcyxSAnmn7sn8viol7Vq 4fj5b+6Shcwqs35YhDDyvEbfGySSMSS+BATg8AVqPwRfdNYHBMmI9S2fYBEsrhWXdDmS dI0HWklecAnZpR+Y+vbyKV6oKstrY2DXs/qyVm23p3hZMWYqKD2ZGYdqiebu2UbF0giE RZf2Xr1VQFzq7B2UQ0ztddtUp2jV3XTSXOtI54jW5Kf7Y3uTcRmd5GiIH6c6c/cDcl35 nczQ== X-Gm-Message-State: AOAM53348+uvhoXpLthCpCXZZsvI04OvNfQIKo/CX7QD9OpTlLwzodRB Mc0ls3qEkoUu52jvmiYUm/A= X-Google-Smtp-Source: ABdhPJyAeNlFxDiVBPOHJMWG5wuMC4SIv1aZnlxDrCBZasVpzhP+kQ465PIh6LwodHsb6JmCLBYRhg== X-Received: by 2002:a17:90a:ac08:: with SMTP id o8mr2335660pjq.87.1639447776847; Mon, 13 Dec 2021 18:09:36 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:36 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 10/22] ASoC: codecs: tlv320aic31xx: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:31 +0900 Message-Id: <20211214020843.2225831-11-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/tlv320aic31xx.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 4224b4b3cae6..e77342aff46d 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1680,11 +1680,9 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, aic31xx->gpio_reset = devm_gpiod_get_optional(aic31xx->dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(aic31xx->gpio_reset)) { - if (PTR_ERR(aic31xx->gpio_reset) != -EPROBE_DEFER) - dev_err(aic31xx->dev, "not able to acquire gpio\n"); - return PTR_ERR(aic31xx->gpio_reset); - } + if (IS_ERR(aic31xx->gpio_reset)) + return dev_err_probe(aic31xx->dev, PTR_ERR(aic31xx->gpio_reset), + "not able to acquire gpio\n"); for (i = 0; i < ARRAY_SIZE(aic31xx->supplies); i++) aic31xx->supplies[i].supply = aic31xx_supply_names[i]; @@ -1692,12 +1690,8 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, ret = devm_regulator_bulk_get(aic31xx->dev, ARRAY_SIZE(aic31xx->supplies), aic31xx->supplies); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(aic31xx->dev, - "Failed to request supplies: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(aic31xx->dev, ret, "Failed to request supplies\n"); aic31xx_configure_ocmv(aic31xx); From patchwork Tue Dec 14 02:08:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523692 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ACD42C433F5 for ; Tue, 14 Dec 2021 02:14:12 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id F07231AD0; Tue, 14 Dec 2021 03:13:20 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F07231AD0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448051; bh=cWMKclLetnQ4nEG8blJfRtuedkCCneiW+He8XtSRpKI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lThPXxy3q08KRjUfl6gv58hezVNhQjB6ZEgn3kafM3aa1vXtL/ycJLG+PX37MMs2m C2gggL3LEF3PpI0gj5Xf4seuE/QCDGGTZrSk2Bju40BaUplJZXYwQl6WN76kk4kTvL ZOO433LQRRCknr07KuxXUBRJ18qPO4d0e2wrz2Lc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 920A2F80570; Tue, 14 Dec 2021 03:09:58 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 37C2FF8053A; Tue, 14 Dec 2021 03:09:51 +0100 (CET) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 24879F80271 for ; Tue, 14 Dec 2021 03:09:41 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 24879F80271 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="caIKRaMo" Received: by mail-pl1-x633.google.com with SMTP id y8so12526754plg.1 for ; Mon, 13 Dec 2021 18:09:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y3U6EO3Kv52WedIYXbB5QoypP7cCOcmuUvXM3OH97mE=; b=caIKRaMogK783EiMlj8wRs4QX+IxjpfpU5FqAdWXGTyGafzOroPc07UkzVirDl4WgX JFZP0odbPNe10zfrEEe7DatJ/0yHnRAd56rPuUWAY736ka5H7yq/qgROb1A+6ZVA3gp0 tfRdlLpxX21v8kI6jAxiNlLnqQwZ3GEgYK4LPHuIh5Fl9UVCHWxjj185UHiBJLJLMWYP QyV4uUL1UfugmTOHEoeDL8OA3nzkvdIzEUnQRORE08mRlNAN6DmC5Fyd+Uit568dufXL 8iImH4dk0cCjtDiuj5NwYJVtwqLBDRZGN7ndF1LYrWgUPJbN9TLwJkFqoYLPLscGxEDN ZFeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=y3U6EO3Kv52WedIYXbB5QoypP7cCOcmuUvXM3OH97mE=; b=3Lur3wJ6PvWRPi92W7cLJbY9+1z61ghg5TswdH9AJiU6x2wvEAbOvBBlTkXrEmTuio SJvCOyOe4JxutNO+A1ft6rNyj5GmeVgV/1forTgIA96r03avkFFuXbH65ujeNTH8vuKx HdeqQJ2wifhV17s0BkRssD2d1tjy+wEZkW5UqapNrCvuL+f5uA3HzzXlCLr6Zf7C6zHp eY4xwi/cT1lwMZlzZ2/V8meuIDQyYwukyCCqwEdKNl0MpzyDpp51gDnI0UdONDa7Fjzq UmvT6E3nnlBnipbs7Yc7/zuIWJQMWWptU7nFECdXH5meN6vY7uAiYdTMZdiZITQiq3iJ PmLw== X-Gm-Message-State: AOAM533ET80OOJ/taWxlL2B2msK5q5KDfQZxiepZByY6oErElZmwzjy1 aMxoDv8jpOaYeSadJrb9ym0= X-Google-Smtp-Source: ABdhPJwCl6y0cXRiZTZ1G7j0aKerKTbWYPVbwKbPLSEcNBooIYJhID2PohPfnlAbOx8m086d1AwqRg== X-Received: by 2002:a17:902:b94b:b0:143:d3bc:9d83 with SMTP id h11-20020a170902b94b00b00143d3bc9d83mr2682072pls.6.1639447778197; Mon, 13 Dec 2021 18:09:38 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:37 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 11/22] ASoC: ateml: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:32 +0900 Message-Id: <20211214020843.2225831-12-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/atmel/mikroe-proto.c | 6 +++--- sound/soc/atmel/tse850-pcm5142.c | 32 ++++++++++++-------------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index f9331f7e80fe..627564c18c27 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -144,9 +144,9 @@ static int snd_proto_probe(struct platform_device *pdev) of_node_put(cpu_np); ret = snd_soc_register_card(&snd_proto); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, - "snd_soc_register_card() failed: %d\n", ret); + if (ret) + dev_err_probe(&pdev->dev, ret, + "snd_soc_register_card() failed\n"); return ret; } diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c index 1b3a31296c9b..ef537de7719c 100644 --- a/sound/soc/atmel/tse850-pcm5142.c +++ b/sound/soc/atmel/tse850-pcm5142.c @@ -371,35 +371,27 @@ static int tse850_probe(struct platform_device *pdev) } tse850->add = devm_gpiod_get(dev, "axentia,add", GPIOD_OUT_HIGH); - if (IS_ERR(tse850->add)) { - if (PTR_ERR(tse850->add) != -EPROBE_DEFER) - dev_err(dev, "failed to get 'add' gpio\n"); - return PTR_ERR(tse850->add); - } + if (IS_ERR(tse850->add)) + return dev_err_probe(dev, PTR_ERR(tse850->add), + "failed to get 'add' gpio\n"); tse850->add_cache = 1; tse850->loop1 = devm_gpiod_get(dev, "axentia,loop1", GPIOD_OUT_HIGH); - if (IS_ERR(tse850->loop1)) { - if (PTR_ERR(tse850->loop1) != -EPROBE_DEFER) - dev_err(dev, "failed to get 'loop1' gpio\n"); - return PTR_ERR(tse850->loop1); - } + if (IS_ERR(tse850->loop1)) + return dev_err_probe(dev, PTR_ERR(tse850->loop1), + "failed to get 'loop1' gpio\n"); tse850->loop1_cache = 1; tse850->loop2 = devm_gpiod_get(dev, "axentia,loop2", GPIOD_OUT_HIGH); - if (IS_ERR(tse850->loop2)) { - if (PTR_ERR(tse850->loop2) != -EPROBE_DEFER) - dev_err(dev, "failed to get 'loop2' gpio\n"); - return PTR_ERR(tse850->loop2); - } + if (IS_ERR(tse850->loop2)) + return dev_err_probe(dev, PTR_ERR(tse850->loop2), + "failed to get 'loop2' gpio\n"); tse850->loop2_cache = 1; tse850->ana = devm_regulator_get(dev, "axentia,ana"); - if (IS_ERR(tse850->ana)) { - if (PTR_ERR(tse850->ana) != -EPROBE_DEFER) - dev_err(dev, "failed to get 'ana' regulator\n"); - return PTR_ERR(tse850->ana); - } + if (IS_ERR(tse850->ana)) + return dev_err_probe(dev, PTR_ERR(tse850->ana), + "failed to get 'ana' regulator\n"); ret = regulator_enable(tse850->ana); if (ret < 0) { From patchwork Tue Dec 14 02:08:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7482C433F5 for ; Tue, 14 Dec 2021 02:13:34 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 095C31ADF; Tue, 14 Dec 2021 03:12:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 095C31ADF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448013; bh=x3GpHzJKyLfWmrZWAhIYdN3g2g7IbRADz1p+3n2SizE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=YaixM17FnRy7vymS4YjEL3K59LLbHQ7fY5oUMNYradx+5Ii7tNO/r3Too0nZexX39 qS3nNO7KB1gjYmULj1eUkaIArfnjhp4BpnbLqYPd5mp+CKiU4XkSdKHyplNa+kKvfx L9/YPAUzAt9XgS3E9zxBcRA50AkCiQJcUFOMK0GU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 81327F8055B; Tue, 14 Dec 2021 03:09:56 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 83051F80533; Tue, 14 Dec 2021 03:09:48 +0100 (CET) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5F4DDF8051B for ; Tue, 14 Dec 2021 03:09:41 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5F4DDF8051B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MUv3GKtO" Received: by mail-pj1-x1032.google.com with SMTP id np6-20020a17090b4c4600b001a90b011e06so14852196pjb.5 for ; Mon, 13 Dec 2021 18:09:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tfKuPEirzmZovO9zaScDKVcFMWzL838W0ZG9woUWLZQ=; b=MUv3GKtOZNpJN96bc+FA2PI2SpZhbtDDABt0pysYIB5qpsG9CEP7zuEzmkG8zVgYb0 QHmWV4GJcXE5zWX5Ae4sEKexBPwZX7VnFrAYbAAivbaAWOGWlGHY81IwAwbTpBQsqtPb JYnJlUmb10tbgyrjhjObBRvcGLYPp9evteySFZTPGfDEtBb8721nSH2aFY96vCjsHGp0 vo3OoHJywwy6RAVs8l4H9iVqq4PphyGJcwBpTiwYDqFfEpvtG3HPeRIFd1E70JQe0vcD fdXgiOOPoBgRO9gzSIUOz1582v40m4bC26zbQdjN43VjYSwkwsrAJB3v1+QNJMNgceJ6 acAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tfKuPEirzmZovO9zaScDKVcFMWzL838W0ZG9woUWLZQ=; b=uNVD/CNoYXhxXubfMT/7X1RjgadS19HVMeBPoD1wMBXLa4zSMdlsc9DFdVXWdgmQAW I3zKUtn2NlRYR4FnJpO1eawCBe1J4tgKkEpMez4KxJBq4+sj2MX4uVgBRN3o/1/M5YYR qebVlN+vwEaV/c4LWwXi/BUQbejD3tc3Rso7othAtYsf/EK7kmMP0kNy2kO0T3ag+ixE gaTI46o+K0ZMdnkns/ai4GWLCb05XKHxgQKLoT3ka157xsGeEUsCfe3kJjQmrnIGq1Qt wUj0DdRU1fEvuGJy4e3xNG2hTgyyd0UFBGJZraMWU2mLL5GCk6FZREHeh/tvgWYWfRdf ibOQ== X-Gm-Message-State: AOAM532kSpnoH5ldI1ymPTYRvNdU/ksNdmsnIrwQzJUdz/cQ3u2Vrun1 yA8rLsvzxHxeyGzg1L+8lb7XfXuAhWc= X-Google-Smtp-Source: ABdhPJx+hA6LEDSxYyg4LcgjuJskm933iXfUKfi1bsyp6N1+rvqUP4Vu7EDIiuoRibmMy14dgF5WAg== X-Received: by 2002:a17:902:e5c9:b0:142:53c4:478d with SMTP id u9-20020a170902e5c900b0014253c4478dmr2103918plf.33.1639447779591; Mon, 13 Dec 2021 18:09:39 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:39 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 12/22] ASoC: ti: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:33 +0900 Message-Id: <20211214020843.2225831-13-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/ti/davinci-mcasp.c | 10 +++------- sound/soc/ti/j721e-evm.c | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 3e105caac95e..2c146b91fca3 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2024,13 +2024,9 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp) tmp = mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK].filter_data; chan = dma_request_chan(mcasp->dev, tmp); - if (IS_ERR(chan)) { - if (PTR_ERR(chan) != -EPROBE_DEFER) - dev_err(mcasp->dev, - "Can't verify DMA configuration (%ld)\n", - PTR_ERR(chan)); - return PTR_ERR(chan); - } + if (IS_ERR(chan)) + return dev_err_probe(mcasp->dev, PTR_ERR(chan), + "Can't verify DMA configuration\n"); if (WARN_ON(!chan->device || !chan->device->dev)) { dma_release_channel(chan); return -EINVAL; diff --git a/sound/soc/ti/j721e-evm.c b/sound/soc/ti/j721e-evm.c index 9347f982c3e1..4077e15ec48b 100644 --- a/sound/soc/ti/j721e-evm.c +++ b/sound/soc/ti/j721e-evm.c @@ -464,13 +464,9 @@ static int j721e_get_clocks(struct device *dev, int ret; clocks->target = devm_clk_get(dev, prefix); - if (IS_ERR(clocks->target)) { - ret = PTR_ERR(clocks->target); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to acquire %s: %d\n", - prefix, ret); - return ret; - } + if (IS_ERR(clocks->target)) + return dev_err_probe(dev, PTR_ERR(clocks->target), + "failed to acquire %s\n", prefix); clk_name = kasprintf(GFP_KERNEL, "%s-48000", prefix); if (clk_name) { From patchwork Tue Dec 14 02:08:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523691 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E7CEC433EF for ; Tue, 14 Dec 2021 02:14:44 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B1EA51B0D; Tue, 14 Dec 2021 03:13:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B1EA51B0D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448082; bh=y2jV7FrdPykhC7jRF7EMV4m3EBpKY+XRYaVXBxA13Xw=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=PlX7qzERBa/fg7l2RXsoArw+1V0f6V8WvFpygh7f4RejUoYWrT1DVt1+AEmc2kNBP 0uWSXk/1uWyMlOe6wPEwk3Z8STIu1W8U3FuWTU6Sz0fNWco6vSzey4g2zFNRfglOd2 M43WXpAt1K9X6YcfTYM6YQFFqYgQbuoAJCcm+cTo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9BF29F80587; Tue, 14 Dec 2021 03:10:00 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6F2D6F8054A; Tue, 14 Dec 2021 03:09:54 +0100 (CET) Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D8374F80527 for ; Tue, 14 Dec 2021 03:09:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D8374F80527 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O0TFNZ4V" Received: by mail-pg1-x531.google.com with SMTP id 200so7294064pgg.3 for ; Mon, 13 Dec 2021 18:09:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L3F85+gScuw2iCO1i31KCrbl5yRrJQv0xVYGhAgYmRM=; b=O0TFNZ4Vl+zsTtOeRE/41cPLUdxeck5kr1/PideANvbrf0Ewi/UI0LsyDNuVs7ERqp ZvQJ6DVnDR6DX7KDsXQd5nhli9TaupDQD/IGRvzwLIe5HPMNOZWP+WFTNTp/rEmvc6eK mX1pS3/GkqBpUyUYocFe7I531pd0+1olKN5nS5i04dUDkMJxm5sTacAC1DJ7v4gFPdgx Mtu2xuWX66Ck6ZzF5Uj8vHsKGzcRQ2R9uUWzNEJGv+pMgho6KdddeBuk03y8W7HRksLH 6yoDk2rXeuS6NxYU/BL1Q3dTAHCBHnKez6nQeSJfPcwiRRZwlyQsaIqr4TFxkRAbJnga GJHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=L3F85+gScuw2iCO1i31KCrbl5yRrJQv0xVYGhAgYmRM=; b=ELuSQYoKABsTFJnRywKqrpG0s/QpWThdNr5AH7dz8sg/WLqUH4MkwXXyWABX5gR+rx GNhcxdBh5hiSpkJVWgq0Kb267n3Gh1cXF1dkuOUAaT1NRZnOzeCJMmIhCuHt9zj907AF +3rYX1opasvY9XDbfZGExQeWbP2wHWOa/Fmjkv6J7feFzDRxeXr/qMtJZNeui6b/qyz7 P4FvPcoGZ6IfyJ9u6keYkyCyWZQnLbzsuHL6xTMAFi/E3eflXh8CxG1fEa+iuFBw/XZn ZuawovQxSzaIumKd7L3AEL0+7jIpPOnQVcXTiKTT+YBTji2weYl5VUtc7qMeXSpjnAD0 zieA== X-Gm-Message-State: AOAM533qEvKmyqB7ZDAxwLlj0BPNm4oTsE0gghAIoeS7ALzjUJy41bUs 2VzSPqRk3ZvMyQWcU37boP8eMOZ46n0= X-Google-Smtp-Source: ABdhPJx6CeBFRYW036dlf8oLt7pqsWJmIzw0Vemtzw9JAG0fkyhWnZdhGWgyYX7g7BBupyPtOydWlg== X-Received: by 2002:aa7:8219:0:b0:4a4:bec7:ef10 with SMTP id k25-20020aa78219000000b004a4bec7ef10mr1742797pfi.37.1639447781046; Mon, 13 Dec 2021 18:09:41 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:40 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 13/22] ASoC: fsl: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:34 +0900 Message-Id: <20211214020843.2225831-14-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/fsl/fsl-asoc-card.c | 3 +-- sound/soc/fsl/imx-card.c | 17 ++++++----------- sound/soc/fsl/imx-sgtl5000.c | 4 +--- sound/soc/fsl/imx-spdif.c | 4 ++-- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 90cbed496f98..5ee945505281 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -853,8 +853,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, &priv->card); if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n"); goto asrc_fail; } diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index 6f06afd23b16..e758c4f1b0bc 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -563,9 +563,8 @@ static int imx_card_parse_of(struct imx_card_data *data) ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name); if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(card->dev, "%s: error getting cpu dai name: %d\n", - link->name, ret); + dev_err_probe(card->dev, ret, + "%s: error getting cpu dai name\n", link->name); goto err; } @@ -573,9 +572,8 @@ static int imx_card_parse_of(struct imx_card_data *data) if (codec) { ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); if (ret < 0) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "%s: codec dai not found: %d\n", - link->name, ret); + dev_err_probe(dev, ret, "%s: codec dai not found\n", + link->name); goto err; } @@ -814,11 +812,8 @@ static int imx_card_probe(struct platform_device *pdev) } ret = devm_snd_soc_register_card(&pdev->dev, &data->card); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n"); return 0; } diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 2f1acd011042..8daced42d55e 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -173,9 +173,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, &data->card); if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", - ret); + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n"); goto fail; } diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 6c4dadf60355..4446fba755b9 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -70,8 +70,8 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) goto end; ret = devm_snd_soc_register_card(&pdev->dev, &data->card); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret); + if (ret) + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n"); end: of_node_put(spdif_np); From patchwork Tue Dec 14 02:08:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3DECC433F5 for ; Tue, 14 Dec 2021 02:14:26 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 14C371AE1; Tue, 14 Dec 2021 03:13:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 14C371AE1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448065; bh=/TQgcnZVaPwE6QgVucHMyrGcGtxHCEhVsK4XJvvbulk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=AJ+3MLUWlW3h6NBphZGrld0y18nnuFbknCX9nPR2VOxIoWqSJwLhxQW9RqJM3BJcg EWWn9gsIyIgClK52Tbpb8ToDCRwVxV+AHKb/cUQKPdPBycs2nRCO4R3nXCJ6yZB5+Z 2G2//8MWjf9EewX0dYTa3BrnshELevJAPAAEoTk8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7C19DF8057A; Tue, 14 Dec 2021 03:09:59 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2901DF8053D; Tue, 14 Dec 2021 03:09:52 +0100 (CET) Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C85DBF80529 for ; Tue, 14 Dec 2021 03:09:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C85DBF80529 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kfDhwTEH" Received: by mail-pg1-x535.google.com with SMTP id r138so16093331pgr.13 for ; Mon, 13 Dec 2021 18:09:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Li4Q+8tpvcGsQn3iQs6uOP5gn0QKZEXqEBjtw0WPMT0=; b=kfDhwTEHQCc4sCjuuaMznyrVt7ZBoNpxO+nPCNqWSPMn8gUG02xQWqX4XARf5gbRAI qakVjl6fuqYlZAnNRLY90FBPReLbCj20M1Q+BGLjSzuSCfQnOoz6g9+74x3qFMTQXIHo OaDWajvYuofo0+eol7Q8IXZoIvGkPMF5pboJ4v8SgD8/hSqUR0XlGEq9w11Gl5eEciRy jvlc4Qf11kBcZ1ogHs5ZmyjQaGL24Tn9sZoAGeqVFdO/Vx6NVsxOisJ10Q76cPlQ39xR /ATQomynSAx6ri9djiQY4GLRlJDj/BjuRkGaEhfG2exx8Pz58w0rUbUn/FEu3flWEBIf 3tfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Li4Q+8tpvcGsQn3iQs6uOP5gn0QKZEXqEBjtw0WPMT0=; b=pc3ulgFh8sSyryByFYqqYbw66puhY/VsGYhL3Tm2vaC0luoguHog37tfjsVCsVXF2t fpFcQ6EmQ6MkpME4xVXuaf5Q/WiHdtCwRpg9ErahLqwsRG/7/eScphRFoJnaFE3ZdjFU 4x8F5gjNvkt1rP6AA9BwJ3gtckcG4VCvE1uk4QdGRluj+67OZu5e9Zl7Ew84uh//S830 YTwS99yqsrNp1e/kBAV7U2RQ1DYzzJgKR5+tPc8PvJgng08SCLCiYsKHNUOtUD+nM32M ZUGYMpT7djfPP2cQgpQXB7Yfb0zXjKjaEQzaMZf/jE9HN/e8cTl85dkcbnr/eDN9um5n D8kg== X-Gm-Message-State: AOAM532rsn4KEOpx1Er0H/vmq3uBR00Hm3Nv4WLmydfbfOxEkKOrryMi XquEhxsG9VPedy5P1lGwsk4= X-Google-Smtp-Source: ABdhPJwAxXMDlPC4GMAD0RJjSfx0pfaSx+g6cykfmFqshq/VLac8icvhro9mLqwRST7C6vrxKIMhLQ== X-Received: by 2002:a63:cc54:: with SMTP id q20mr1638857pgi.553.1639447782530; Mon, 13 Dec 2021 18:09:42 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:42 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 14/22] ASoC: generic: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:35 +0900 Message-Id: <20211214020843.2225831-15-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/audio-graph-card.c | 5 +---- sound/soc/generic/audio-graph-card2.c | 4 ++-- sound/soc/generic/simple-card.c | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 7eb027238327..2b598af8feef 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -593,10 +593,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) err: asoc_simple_clean_reference(card); - if (ret != -EPROBE_DEFER) - dev_err(dev, "parse error %d\n", ret); - - return ret; + return dev_err_probe(dev, ret, "parse error\n"); } EXPORT_SYMBOL_GPL(audio_graph_parse_of); diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index b6049bcfb771..c3947347dda3 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -1238,8 +1238,8 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, err: devm_kfree(dev, li); - if ((ret < 0) && (ret != -EPROBE_DEFER)) - dev_err(dev, "parse error %d\n", ret); + if (ret < 0) + dev_err_probe(dev, ret, "parse error\n"); return ret; } diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index a3a7990b5cb6..a89d1cfdda32 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -642,8 +642,7 @@ static int asoc_simple_probe(struct platform_device *pdev) ret = simple_parse_of(priv, li); if (ret < 0) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "parse error %d\n", ret); + dev_err_probe(dev, ret, "parse error\n"); goto err; } From patchwork Tue Dec 14 02:08:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525052 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5777AC433F5 for ; Tue, 14 Dec 2021 02:14:58 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 953801AEA; Tue, 14 Dec 2021 03:14:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 953801AEA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448096; bh=6VCsq0zPRtndlyARduu6CGAoY4V9TBkprQN5VbC3dtM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=sfu8+5Y0vzqqo3tkFP0tXbh4k2s3ssue4ddfWqgYeF2Y8/ld6Xs/KywNdaY5KX+Ma o2lnhzFCACCcvGPTrOh22+bs1n1C8UG7KI4uUUwK6PPuM9kLqxXz2Z6M/hr7xueZmU RTAv1IXNUbj6skQoN6zrW58Ubc4Wuf3iLsiK9Qv0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 05E78F8057D; Tue, 14 Dec 2021 03:10:04 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 053D2F8055B; Tue, 14 Dec 2021 03:09:55 +0100 (CET) Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 8D0D2F8051B for ; Tue, 14 Dec 2021 03:09:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8D0D2F8051B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XmOcDYld" Received: by mail-pl1-x62c.google.com with SMTP id p18so12476046plf.13 for ; Mon, 13 Dec 2021 18:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=01SNm5V6Ok+GPemak/uYh+NgF0ENZPJa+gfjvOiRKJk=; b=XmOcDYldtrKZFw9RUMgYWcoX1uSdplZj4y7C5eKtdLhaKgwBHlsXqTN0ZiQau7U0YV BCB+fgMIHBOkZemXMP/y6cEMyk9uIzwW50OxMqK2hTuJP5x9L0lBMRt/sVLE1fsqKhAg Z//JHN4SjJsxw1Mg2dVboWmahVJoBzVv0cB6YTotutkZoEIwDI/mp+fAccTJ0PFUno74 KUa+r9VfBioOfm19okTNo1wZ2iL+bNkFCY8+Rqyw/tGTsHX31JUkzozL+gxFbZD/YIeO kaNO2HsKAs0bZUjzxcKpHZpJmXGBC51tRiJy8iVP2mWkQ1k5bqsWaDYZhznQNCjiZOgH 7+ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=01SNm5V6Ok+GPemak/uYh+NgF0ENZPJa+gfjvOiRKJk=; b=y2hEUnazyAYs1faTmungsuneYKDx+WLLdwqe3DYOcofaWLDdys2QwtUBsFyQ6A0d0M DxUuwdwtieQ+rzNNFZCd3HYNgobCo24z04S1EQid5Ez+J44bRUMjqFKjssdwnI6U9g3t HHzbWAdUyhHExmc0zM2dgG2aRjdl5lRcQW+O+7vXALabMNkAi8a5Cwpwzf5P48JDkh66 zr6a+sRkUqZZrKzdX5keD/E/jRI76B7hMlHO6NaZheuC3fPJ0MmXXFet5UfzOp+wveJ3 LgE7dmTGxVILUuBcjAK/jdLuCHlGORaaV2NqejyaBeQ93PaMMtlTU8Srk28dDe8L5L1D ewxw== X-Gm-Message-State: AOAM530GTEQsierhW0MXGuVtP8JAyomUkWeSR/ffqDQRmyNX2+TjlF6w 05/YVFCw5YTYO6CoO7CDM+8= X-Google-Smtp-Source: ABdhPJwcQ3Tvt8xl03QbSarxcNhqe4OFtRxpcPul3p6pi0tS5O6vgna+6rojac2eOwiF3+SmjSZZAw== X-Received: by 2002:a17:90a:1b67:: with SMTP id q94mr2234252pjq.119.1639447783938; Mon, 13 Dec 2021 18:09:43 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:43 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 15/22] ASoC: img: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:36 +0900 Message-Id: <20211214020843.2225831-16-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/img/img-i2s-in.c | 8 +++----- sound/soc/img/img-i2s-out.c | 24 +++++++++--------------- sound/soc/img/img-parallel-out.c | 24 +++++++++--------------- sound/soc/img/img-spdif-in.c | 8 +++----- sound/soc/img/img-spdif-out.c | 24 +++++++++--------------- sound/soc/img/pistachio-internal-dac.c | 9 +++------ 6 files changed, 36 insertions(+), 61 deletions(-) diff --git a/sound/soc/img/img-i2s-in.c b/sound/soc/img/img-i2s-in.c index 1bf5d6edbd32..f1f36f15a503 100644 --- a/sound/soc/img/img-i2s-in.c +++ b/sound/soc/img/img-i2s-in.c @@ -451,11 +451,9 @@ static int img_i2s_in_probe(struct platform_device *pdev) i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20); i2s->clk_sys = devm_clk_get(dev, "sys"); - if (IS_ERR(i2s->clk_sys)) { - if (PTR_ERR(i2s->clk_sys) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'sys'\n"); - return PTR_ERR(i2s->clk_sys); - } + if (IS_ERR(i2s->clk_sys)) + return dev_err_probe(dev, PTR_ERR(i2s->clk_sys), + "Failed to acquire clock 'sys'\n"); pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { diff --git a/sound/soc/img/img-i2s-out.c b/sound/soc/img/img-i2s-out.c index 4f90d36dc7df..28f48ca1508a 100644 --- a/sound/soc/img/img-i2s-out.c +++ b/sound/soc/img/img-i2s-out.c @@ -457,25 +457,19 @@ static int img_i2s_out_probe(struct platform_device *pdev) i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20); i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst"); - if (IS_ERR(i2s->rst)) { - if (PTR_ERR(i2s->rst) != -EPROBE_DEFER) - dev_err(&pdev->dev, "No top level reset found\n"); - return PTR_ERR(i2s->rst); - } + if (IS_ERR(i2s->rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->rst), + "No top level reset found\n"); i2s->clk_sys = devm_clk_get(&pdev->dev, "sys"); - if (IS_ERR(i2s->clk_sys)) { - if (PTR_ERR(i2s->clk_sys) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'sys'\n"); - return PTR_ERR(i2s->clk_sys); - } + if (IS_ERR(i2s->clk_sys)) + return dev_err_probe(dev, PTR_ERR(i2s->clk_sys), + "Failed to acquire clock 'sys'\n"); i2s->clk_ref = devm_clk_get(&pdev->dev, "ref"); - if (IS_ERR(i2s->clk_ref)) { - if (PTR_ERR(i2s->clk_ref) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'ref'\n"); - return PTR_ERR(i2s->clk_ref); - } + if (IS_ERR(i2s->clk_ref)) + return dev_err_probe(dev, PTR_ERR(i2s->clk_ref), + "Failed to acquire clock 'ref'\n"); i2s->suspend_ch_ctl = devm_kcalloc(dev, i2s->max_i2s_chan, sizeof(*i2s->suspend_ch_ctl), GFP_KERNEL); diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c index ce0f08d3777c..800f247283cd 100644 --- a/sound/soc/img/img-parallel-out.c +++ b/sound/soc/img/img-parallel-out.c @@ -229,25 +229,19 @@ static int img_prl_out_probe(struct platform_device *pdev) prl->base = base; prl->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst"); - if (IS_ERR(prl->rst)) { - if (PTR_ERR(prl->rst) != -EPROBE_DEFER) - dev_err(&pdev->dev, "No top level reset found\n"); - return PTR_ERR(prl->rst); - } + if (IS_ERR(prl->rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(prl->rst), + "No top level reset found\n"); prl->clk_sys = devm_clk_get(&pdev->dev, "sys"); - if (IS_ERR(prl->clk_sys)) { - if (PTR_ERR(prl->clk_sys) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'sys'\n"); - return PTR_ERR(prl->clk_sys); - } + if (IS_ERR(prl->clk_sys)) + return dev_err_probe(dev, PTR_ERR(prl->clk_sys), + "Failed to acquire clock 'sys'\n"); prl->clk_ref = devm_clk_get(&pdev->dev, "ref"); - if (IS_ERR(prl->clk_ref)) { - if (PTR_ERR(prl->clk_ref) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'ref'\n"); - return PTR_ERR(prl->clk_ref); - } + if (IS_ERR(prl->clk_ref)) + return dev_err_probe(dev, PTR_ERR(prl->clk_ref), + "Failed to acquire clock 'ref'\n"); ret = clk_prepare_enable(prl->clk_sys); if (ret) diff --git a/sound/soc/img/img-spdif-in.c b/sound/soc/img/img-spdif-in.c index 6364eb742f6d..95914d0612fe 100644 --- a/sound/soc/img/img-spdif-in.c +++ b/sound/soc/img/img-spdif-in.c @@ -739,11 +739,9 @@ static int img_spdif_in_probe(struct platform_device *pdev) spdif->base = base; spdif->clk_sys = devm_clk_get(dev, "sys"); - if (IS_ERR(spdif->clk_sys)) { - if (PTR_ERR(spdif->clk_sys) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'sys'\n"); - return PTR_ERR(spdif->clk_sys); - } + if (IS_ERR(spdif->clk_sys)) + return dev_err_probe(dev, PTR_ERR(spdif->clk_sys), + "Failed to acquire clock 'sys'\n"); pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { diff --git a/sound/soc/img/img-spdif-out.c b/sound/soc/img/img-spdif-out.c index 858e1b853820..c3189d9ff72f 100644 --- a/sound/soc/img/img-spdif-out.c +++ b/sound/soc/img/img-spdif-out.c @@ -342,25 +342,19 @@ static int img_spdif_out_probe(struct platform_device *pdev) spdif->base = base; spdif->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst"); - if (IS_ERR(spdif->rst)) { - if (PTR_ERR(spdif->rst) != -EPROBE_DEFER) - dev_err(&pdev->dev, "No top level reset found\n"); - return PTR_ERR(spdif->rst); - } + if (IS_ERR(spdif->rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(spdif->rst), + "No top level reset found\n"); spdif->clk_sys = devm_clk_get(&pdev->dev, "sys"); - if (IS_ERR(spdif->clk_sys)) { - if (PTR_ERR(spdif->clk_sys) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'sys'\n"); - return PTR_ERR(spdif->clk_sys); - } + if (IS_ERR(spdif->clk_sys)) + return dev_err_probe(dev, PTR_ERR(spdif->clk_sys), + "Failed to acquire clock 'sys'\n"); spdif->clk_ref = devm_clk_get(&pdev->dev, "ref"); - if (IS_ERR(spdif->clk_ref)) { - if (PTR_ERR(spdif->clk_ref) != -EPROBE_DEFER) - dev_err(dev, "Failed to acquire clock 'ref'\n"); - return PTR_ERR(spdif->clk_ref); - } + if (IS_ERR(spdif->clk_ref)) + return dev_err_probe(dev, PTR_ERR(spdif->clk_ref), + "Failed to acquire clock 'ref'\n"); pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { diff --git a/sound/soc/img/pistachio-internal-dac.c b/sound/soc/img/pistachio-internal-dac.c index fe181c2e51d6..802c0ee63aa2 100644 --- a/sound/soc/img/pistachio-internal-dac.c +++ b/sound/soc/img/pistachio-internal-dac.c @@ -161,12 +161,9 @@ static int pistachio_internal_dac_probe(struct platform_device *pdev) return PTR_ERR(dac->regmap); dac->supply = devm_regulator_get(dev, "VDD"); - if (IS_ERR(dac->supply)) { - ret = PTR_ERR(dac->supply); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to acquire supply 'VDD-supply': %d\n", ret); - return ret; - } + if (IS_ERR(dac->supply)) + return dev_err_probe(dev, PTR_ERR(dac->supply), + "failed to acquire supply 'VDD-supply'\n"); ret = regulator_enable(dac->supply); if (ret) { From patchwork Tue Dec 14 02:08:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56F73C433F5 for ; Tue, 14 Dec 2021 02:15:34 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6C03F1ED7; Tue, 14 Dec 2021 03:14:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6C03F1ED7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448132; bh=QuW9LZxtU6gZmopXKfF1Lzyij+Xa4oggm4C7w9xhLGE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=RALVpuGXfC/pccMQ8NvWB/ptxH5uxwuZCFYjMAiehoQ07mZEU9U5KgttiKaTn4Omk rlUQiMrPic52y5rpIkU3+oJJsTEtFW51S1FOtPrAVDScjCzpLNx/Zucnfk8IRKips6 MNJgJu+mZdIva3j2yXdgik9w0YG3mReV7dWbGDug= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 30BAFF805A9; Tue, 14 Dec 2021 03:10:06 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 93549F8058C; Tue, 14 Dec 2021 03:10:01 +0100 (CET) Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6DBB8F80535 for ; Tue, 14 Dec 2021 03:09:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6DBB8F80535 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XRjKmSFG" Received: by mail-pg1-x52e.google.com with SMTP id k4so16124323pgb.8 for ; Mon, 13 Dec 2021 18:09:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wp45VQT5DqY04bk5bm0mAq3SR0p4/w1XHvrPZLjlHQk=; b=XRjKmSFGDbx7VBif50EghtqFPDh7TYK6II/ldYdKgyE6Z/WOIzIIWUNs+Eh9vFhfKo jykfqL9bolYRMP3pl1cvHfQ89J+V8QlF7sR/WtRQNHcvSmeDz0yqM0FF14pBEgk3DgZD NkCcmA+Fe5f2SbSBWadJk+yovIIj5ziF1cSDe2dXZLd0R/BMnZxmalShAHaIALgnh41a y38ggeouT034UsNlKpPcaZI/n3OQhIvjYP++IP+lXcpR+COWRojL+5VchTHWHmotGtm+ kqETpWIfcSaoxKulAyBi3bZAOVb04VKhQ5qx3zN0fhC4Pn4aWlKoqwx31eMteDUrhLpE xXdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wp45VQT5DqY04bk5bm0mAq3SR0p4/w1XHvrPZLjlHQk=; b=6HWBu1HCEUQAfIUcLK201uUERv6BMkdvv+6fybAKk3Ep1ncOp22niNlFYeU28zbIke +TPg8EUiowrKmnHMVtFSlazbQSQAq3VRFPUeTS/KCAPDWJmpYX/D2aHSN6HnfTehOW1/ 89D+edF2vqGI/Rwd10wfH1aW406aHRb1tqzwmpAr5rCNQHfZDdr3irCec5fHlcJ/vmkw ddhoyaGrlDZxl8vzAYC/nU0hLatxrNNkQcD2vcdplk5xolZfjMeQnkWdcYa53nAM+LOf 8iOhDcnb9zmVp9oeYbV659jYF5wJHqjiGyBXO7V3iwIeGrygMDpO+2gwmIRjuDzNI9gU /xEQ== X-Gm-Message-State: AOAM530y+s2rVtuf/BDBMHxsJpugzp9flV/rdQypmuX3COdtBBpMaukH zfn8DetpgsPZ/meTVyosKM0= X-Google-Smtp-Source: ABdhPJweHEQk2coBKEra7KFmdCsjezm/7dlycTmKDOfFjSJ5pX6fWY3CEsmN8K9fDf/9VbFeHr3oOw== X-Received: by 2002:a63:6a87:: with SMTP id f129mr1665421pgc.391.1639447785475; Mon, 13 Dec 2021 18:09:45 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:45 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 16/22] ASoC: meson: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:37 +0900 Message-Id: <20211214020843.2225831-17-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/meson/aiu.c | 36 +++++++-------------- sound/soc/meson/axg-fifo.c | 16 +++------ sound/soc/meson/axg-pdm.c | 25 ++++----------- sound/soc/meson/axg-spdifin.c | 17 +++------- sound/soc/meson/axg-spdifout.c | 17 +++------- sound/soc/meson/axg-tdm-formatter.c | 50 ++++++++--------------------- sound/soc/meson/axg-tdm-interface.c | 25 ++++----------- sound/soc/meson/meson-card-utils.c | 8 ++--- sound/soc/meson/t9015.c | 14 +++----- 9 files changed, 56 insertions(+), 152 deletions(-) diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c index ba15d5762b0b..d299a70db7e5 100644 --- a/sound/soc/meson/aiu.c +++ b/sound/soc/meson/aiu.c @@ -218,34 +218,23 @@ static int aiu_clk_get(struct device *dev) int ret; aiu->pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(aiu->pclk)) { - if (PTR_ERR(aiu->pclk) != -EPROBE_DEFER) - dev_err(dev, "Can't get the aiu pclk\n"); - return PTR_ERR(aiu->pclk); - } + if (IS_ERR(aiu->pclk)) + return dev_err_probe(dev, PTR_ERR(aiu->pclk), "Can't get the aiu pclk\n"); aiu->spdif_mclk = devm_clk_get(dev, "spdif_mclk"); - if (IS_ERR(aiu->spdif_mclk)) { - if (PTR_ERR(aiu->spdif_mclk) != -EPROBE_DEFER) - dev_err(dev, "Can't get the aiu spdif master clock\n"); - return PTR_ERR(aiu->spdif_mclk); - } + if (IS_ERR(aiu->spdif_mclk)) + return dev_err_probe(dev, PTR_ERR(aiu->spdif_mclk), + "Can't get the aiu spdif master clock\n"); ret = aiu_clk_bulk_get(dev, aiu_i2s_ids, ARRAY_SIZE(aiu_i2s_ids), &aiu->i2s); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "Can't get the i2s clocks\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Can't get the i2s clocks\n"); ret = aiu_clk_bulk_get(dev, aiu_spdif_ids, ARRAY_SIZE(aiu_spdif_ids), &aiu->spdif); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "Can't get the spdif clocks\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Can't get the spdif clocks\n"); ret = clk_prepare_enable(aiu->pclk); if (ret) { @@ -281,11 +270,8 @@ static int aiu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, aiu); ret = device_reset(dev); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to reset device\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to reset device\n"); regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(regs)) diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c index b9af2d513e09..bccfb770b339 100644 --- a/sound/soc/meson/axg-fifo.c +++ b/sound/soc/meson/axg-fifo.c @@ -351,20 +351,12 @@ int axg_fifo_probe(struct platform_device *pdev) } fifo->pclk = devm_clk_get(dev, NULL); - if (IS_ERR(fifo->pclk)) { - if (PTR_ERR(fifo->pclk) != -EPROBE_DEFER) - dev_err(dev, "failed to get pclk: %ld\n", - PTR_ERR(fifo->pclk)); - return PTR_ERR(fifo->pclk); - } + if (IS_ERR(fifo->pclk)) + return dev_err_probe(dev, PTR_ERR(fifo->pclk), "failed to get pclk\n"); fifo->arb = devm_reset_control_get_exclusive(dev, NULL); - if (IS_ERR(fifo->arb)) { - if (PTR_ERR(fifo->arb) != -EPROBE_DEFER) - dev_err(dev, "failed to get arb reset: %ld\n", - PTR_ERR(fifo->arb)); - return PTR_ERR(fifo->arb); - } + if (IS_ERR(fifo->arb)) + return dev_err_probe(dev, PTR_ERR(fifo->arb), "failed to get arb reset\n"); fifo->irq = of_irq_get(dev->of_node, 0); if (fifo->irq <= 0) { diff --git a/sound/soc/meson/axg-pdm.c b/sound/soc/meson/axg-pdm.c index bfd37d49a73e..672e43a9729d 100644 --- a/sound/soc/meson/axg-pdm.c +++ b/sound/soc/meson/axg-pdm.c @@ -586,7 +586,6 @@ static int axg_pdm_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct axg_pdm *priv; void __iomem *regs; - int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -611,28 +610,16 @@ static int axg_pdm_probe(struct platform_device *pdev) } priv->pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(priv->pclk)) { - ret = PTR_ERR(priv->pclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get pclk: %d\n", ret); - return ret; - } + if (IS_ERR(priv->pclk)) + return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get pclk\n"); priv->dclk = devm_clk_get(dev, "dclk"); - if (IS_ERR(priv->dclk)) { - ret = PTR_ERR(priv->dclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get dclk: %d\n", ret); - return ret; - } + if (IS_ERR(priv->dclk)) + return dev_err_probe(dev, PTR_ERR(priv->dclk), "failed to get dclk\n"); priv->sysclk = devm_clk_get(dev, "sysclk"); - if (IS_ERR(priv->sysclk)) { - ret = PTR_ERR(priv->sysclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get dclk: %d\n", ret); - return ret; - } + if (IS_ERR(priv->sysclk)) + return dev_err_probe(dev, PTR_ERR(priv->sysclk), "failed to get dclk\n"); return devm_snd_soc_register_component(dev, &axg_pdm_component_drv, &axg_pdm_dai_drv, 1); diff --git a/sound/soc/meson/axg-spdifin.c b/sound/soc/meson/axg-spdifin.c index d0d09f945b48..4ba44e0d65d9 100644 --- a/sound/soc/meson/axg-spdifin.c +++ b/sound/soc/meson/axg-spdifin.c @@ -454,7 +454,6 @@ static int axg_spdifin_probe(struct platform_device *pdev) struct axg_spdifin *priv; struct snd_soc_dai_driver *dai_drv; void __iomem *regs; - int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -479,20 +478,12 @@ static int axg_spdifin_probe(struct platform_device *pdev) } priv->pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(priv->pclk)) { - ret = PTR_ERR(priv->pclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get pclk: %d\n", ret); - return ret; - } + if (IS_ERR(priv->pclk)) + return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get pclk\n"); priv->refclk = devm_clk_get(dev, "refclk"); - if (IS_ERR(priv->refclk)) { - ret = PTR_ERR(priv->refclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get mclk: %d\n", ret); - return ret; - } + if (IS_ERR(priv->refclk)) + return dev_err_probe(dev, PTR_ERR(priv->refclk), "failed to get mclk\n"); dai_drv = axg_spdifin_get_dai_drv(dev, priv); if (IS_ERR(dai_drv)) { diff --git a/sound/soc/meson/axg-spdifout.c b/sound/soc/meson/axg-spdifout.c index e769a5ee6e27..3960d082e143 100644 --- a/sound/soc/meson/axg-spdifout.c +++ b/sound/soc/meson/axg-spdifout.c @@ -403,7 +403,6 @@ static int axg_spdifout_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct axg_spdifout *priv; void __iomem *regs; - int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -422,20 +421,12 @@ static int axg_spdifout_probe(struct platform_device *pdev) } priv->pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(priv->pclk)) { - ret = PTR_ERR(priv->pclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get pclk: %d\n", ret); - return ret; - } + if (IS_ERR(priv->pclk)) + return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get pclk\n"); priv->mclk = devm_clk_get(dev, "mclk"); - if (IS_ERR(priv->mclk)) { - ret = PTR_ERR(priv->mclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get mclk: %d\n", ret); - return ret; - } + if (IS_ERR(priv->mclk)) + return dev_err_probe(dev, PTR_ERR(priv->mclk), "failed to get mclk\n"); return devm_snd_soc_register_component(dev, &axg_spdifout_component_drv, axg_spdifout_dai_drv, ARRAY_SIZE(axg_spdifout_dai_drv)); diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c index cab7fa2851aa..9883dc777f63 100644 --- a/sound/soc/meson/axg-tdm-formatter.c +++ b/sound/soc/meson/axg-tdm-formatter.c @@ -255,7 +255,6 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) const struct axg_tdm_formatter_driver *drv; struct axg_tdm_formatter *formatter; void __iomem *regs; - int ret; drv = of_device_get_match_data(dev); if (!drv) { @@ -282,57 +281,34 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) /* Peripharal clock */ formatter->pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(formatter->pclk)) { - ret = PTR_ERR(formatter->pclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get pclk: %d\n", ret); - return ret; - } + if (IS_ERR(formatter->pclk)) + return dev_err_probe(dev, PTR_ERR(formatter->pclk), "failed to get pclk\n"); /* Formatter bit clock */ formatter->sclk = devm_clk_get(dev, "sclk"); - if (IS_ERR(formatter->sclk)) { - ret = PTR_ERR(formatter->sclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get sclk: %d\n", ret); - return ret; - } + if (IS_ERR(formatter->sclk)) + return dev_err_probe(dev, PTR_ERR(formatter->sclk), "failed to get sclk\n"); /* Formatter sample clock */ formatter->lrclk = devm_clk_get(dev, "lrclk"); - if (IS_ERR(formatter->lrclk)) { - ret = PTR_ERR(formatter->lrclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get lrclk: %d\n", ret); - return ret; - } + if (IS_ERR(formatter->lrclk)) + return dev_err_probe(dev, PTR_ERR(formatter->lrclk), "failed to get lrclk\n"); /* Formatter bit clock input multiplexer */ formatter->sclk_sel = devm_clk_get(dev, "sclk_sel"); - if (IS_ERR(formatter->sclk_sel)) { - ret = PTR_ERR(formatter->sclk_sel); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get sclk_sel: %d\n", ret); - return ret; - } + if (IS_ERR(formatter->sclk_sel)) + return dev_err_probe(dev, PTR_ERR(formatter->sclk_sel), "failed to get sclk_sel\n"); /* Formatter sample clock input multiplexer */ formatter->lrclk_sel = devm_clk_get(dev, "lrclk_sel"); - if (IS_ERR(formatter->lrclk_sel)) { - ret = PTR_ERR(formatter->lrclk_sel); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get lrclk_sel: %d\n", ret); - return ret; - } + if (IS_ERR(formatter->lrclk_sel)) + return dev_err_probe(dev, PTR_ERR(formatter->lrclk_sel), + "failed to get lrclk_sel\n"); /* Formatter dedicated reset line */ formatter->reset = devm_reset_control_get_optional_exclusive(dev, NULL); - if (IS_ERR(formatter->reset)) { - ret = PTR_ERR(formatter->reset); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get reset: %d\n", ret); - return ret; - } + if (IS_ERR(formatter->reset)) + return dev_err_probe(dev, PTR_ERR(formatter->reset), "failed to get reset\n"); return devm_snd_soc_register_component(dev, drv->component_drv, NULL, 0); diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c index db077773af7a..0c31934a9630 100644 --- a/sound/soc/meson/axg-tdm-interface.c +++ b/sound/soc/meson/axg-tdm-interface.c @@ -533,21 +533,13 @@ static int axg_tdm_iface_probe(struct platform_device *pdev) /* Bit clock provided on the pad */ iface->sclk = devm_clk_get(dev, "sclk"); - if (IS_ERR(iface->sclk)) { - ret = PTR_ERR(iface->sclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get sclk: %d\n", ret); - return ret; - } + if (IS_ERR(iface->sclk)) + return dev_err_probe(dev, PTR_ERR(iface->sclk), "failed to get sclk\n"); /* Sample clock provided on the pad */ iface->lrclk = devm_clk_get(dev, "lrclk"); - if (IS_ERR(iface->lrclk)) { - ret = PTR_ERR(iface->lrclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get lrclk: %d\n", ret); - return ret; - } + if (IS_ERR(iface->lrclk)) + return dev_err_probe(dev, PTR_ERR(iface->lrclk), "failed to get lrclk\n"); /* * mclk maybe be missing when the cpu dai is in slave mode and @@ -558,13 +550,10 @@ static int axg_tdm_iface_probe(struct platform_device *pdev) iface->mclk = devm_clk_get(dev, "mclk"); if (IS_ERR(iface->mclk)) { ret = PTR_ERR(iface->mclk); - if (ret == -ENOENT) { + if (ret == -ENOENT) iface->mclk = NULL; - } else { - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get mclk: %d\n", ret); - return ret; - } + else + return dev_err_probe(dev, ret, "failed to get mclk\n"); } return devm_snd_soc_register_component(dev, diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index 29b0174f4b5c..2d8d5717fd8b 100644 --- a/sound/soc/meson/meson-card-utils.c +++ b/sound/soc/meson/meson-card-utils.c @@ -85,11 +85,9 @@ int meson_card_parse_dai(struct snd_soc_card *card, ret = of_parse_phandle_with_args(node, "sound-dai", "#sound-dai-cells", 0, &args); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(card->dev, "can't parse dai %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(card->dev, ret, "can't parse dai\n"); + *dai_of_node = args.np; return snd_soc_get_dai_name(&args, dai_name); diff --git a/sound/soc/meson/t9015.c b/sound/soc/meson/t9015.c index 4c1349dd1e06..a9b8c4e77d40 100644 --- a/sound/soc/meson/t9015.c +++ b/sound/soc/meson/t9015.c @@ -258,18 +258,12 @@ static int t9015_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); priv->pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(priv->pclk)) { - if (PTR_ERR(priv->pclk) != -EPROBE_DEFER) - dev_err(dev, "failed to get core clock\n"); - return PTR_ERR(priv->pclk); - } + if (IS_ERR(priv->pclk)) + return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get core clock\n"); priv->avdd = devm_regulator_get(dev, "AVDD"); - if (IS_ERR(priv->avdd)) { - if (PTR_ERR(priv->avdd) != -EPROBE_DEFER) - dev_err(dev, "failed to AVDD\n"); - return PTR_ERR(priv->avdd); - } + if (IS_ERR(priv->avdd)) + return dev_err_probe(dev, PTR_ERR(priv->avdd), "failed to AVDD\n"); ret = clk_prepare_enable(priv->pclk); if (ret) { From patchwork Tue Dec 14 02:08:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523690 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9E2A1C433F5 for ; Tue, 14 Dec 2021 02:15:16 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DF4691EE5; Tue, 14 Dec 2021 03:14:24 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DF4691EE5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448115; bh=WlBZA3hOwkSnvjYnMyM/xT2LOEuYLWEibGpivmPSmf4=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Ux8da5OMz0ayVC8NP7tOFt6LaNL56AqgiAuDpLIZp2ni3gwc0X/IiqOOM01VuRLJz P0JTPUJF79X/buxjr++A371kNJZvrcVo4zbgw2ywxmYoCJGg7WFyPARPpL6f4tAsAL 30dInz2bUT38WZWF+WKE48r+wUQDg2iJVYdcbkzk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9D32CF80552; Tue, 14 Dec 2021 03:10:05 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C82F6F80566; Tue, 14 Dec 2021 03:09:57 +0100 (CET) Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5AF92F80271 for ; Tue, 14 Dec 2021 03:09:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5AF92F80271 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bS9lECcq" Received: by mail-pf1-x436.google.com with SMTP id k26so16559113pfp.10 for ; Mon, 13 Dec 2021 18:09:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gWLNyRd+QR94H4OPXuxp57vguJN59LfbMWiwC+2REnc=; b=bS9lECcqcWrBGRfgBF4EDrgXb1QfA9MlFtMPLNQz2e/dC0L6MN0koSnfdYrq5+SdBU kMZTvBb+skhgq+5oxfcRPcqbbXNnXm7+DbBaFZfMk8Td41DSkGG72gvbcP2IPuOECfph h6++UrdLxWR1gwSM6kkzRClFxs1ph6QZG5Z1IyfEuzJpvyiX64LIlxocFH/H0tz4XSzj FHs7FFWUwBv2GEYnekVajwT5whLnrQrITcRi2V6qaWEyVvK/u39gukFyFCV+iiqWBVP5 B/4EB1Ux3rbPVJ+MQT8yG9iALK4tT5B+TwYWBit0eLLR2NUTu//rp9/OXLy85qb2PBmD kNrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gWLNyRd+QR94H4OPXuxp57vguJN59LfbMWiwC+2REnc=; b=MJQkX07zfutHqr4FPMldrnL9LRtfSX6SlJ/i4VtVKgfIhE1geRaPNAs9pBnLRPVCCg q/MbslhVoyzOrnJbeWAT8mP8etU11398ueqMvbWrFSq69Y01X3HhS00IJkq7hos3K/uq X1euCM3Oo8zOPN9ZjYZlaknAhsyuxIYzvPJdLOIaDNmD0jbeZW9P3Rp6CvcEpkTq42l9 ffEZS0ENURt8GXhmN33BePteJXAC+gl+Y/lZTSpei/mK0oKc3UbKcEmhNgtwpkuEgvFt Zsm61AXBKfWY9UHLWVE1ez04lN7T1wCmmVgpsMUKf5elwRHbCNNKHwPr3H9b7YohIC15 N8wQ== X-Gm-Message-State: AOAM532zEY90PYLwHEE8TXRzDzByq5xBFtbXT7TRIi3s06SyIRX9eAU+ 7NK5gNpmHShqpDa5lAxetvoWjviz7ok= X-Google-Smtp-Source: ABdhPJxxzFTdcCFg0UBHRKdA/ZelC1gl4XSw2BsDR7I4vGigRpiNxdmy0oFJgFTqESPe3HQ3kVkfsA== X-Received: by 2002:a63:d608:: with SMTP id q8mr1697569pgg.84.1639447786840; Mon, 13 Dec 2021 18:09:46 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:46 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 17/22] ASoC: mxs: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:38 +0900 Message-Id: <20211214020843.2225831-18-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/mxs/mxs-sgtl5000.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index a6407f4388de..2412dc7e65d4 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -160,12 +160,8 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) } ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", - ret); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n"); return 0; } From patchwork Tue Dec 14 02:08:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F23D4C433EF for ; Tue, 14 Dec 2021 02:15:47 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 458891EFD; Tue, 14 Dec 2021 03:14:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 458891EFD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448146; bh=sKblV5eTzNMbrV8+n6vDt1bRP8aKO7Na92dspOY3hHk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qAN3E2PpvTe3QKgoTY07E3HCndiQEBRvMANLUDLzNGJdRAPWqnbGTQ+v56O/ECOHP Et/uO7PUIvUaLSWRXp0KQFNh4kSa8aKVCjChyuNjQETM3FVmFqlS3gfkdoeH2bUrsR aG1LdymRWQjgXvw/79d2pXTOj+KvauK8L+tBGfIk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id DFE2BF80557; Tue, 14 Dec 2021 03:10:06 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2585AF80589; Tue, 14 Dec 2021 03:10:02 +0100 (CET) Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2921DF8053E for ; Tue, 14 Dec 2021 03:09:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2921DF8053E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gflC/poU" Received: by mail-pg1-x531.google.com with SMTP id 133so16099447pgc.12 for ; Mon, 13 Dec 2021 18:09:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6u6FkCPCfv4J7pdg4Ybljstse/ix+a86moRRp7mRqHM=; b=gflC/poUt+2r7cA9Q5zzWqPY8DRXaTP5MRDsuAQXZiUILJxP5ELCxq6TEKRuP7gi5e tjkaWbVFlIXFuxWZRrzv1amRPpBaPUUHHz5/YCxBuyt+yNfO8fVuryrTEWKLN7tXu/e2 NJ38CrTYOPE/k4ZjQz2EZ8kSXfU40hAZIgnoqb/yp5JWOK8BvaNvVRlrMK9I4OyDmctx oHInFeWTtW0QSfrvv2v3a5iWz9GuZUxaePkKHFG9nBB3utZP3m6b3JDlO3oUfuf5WTuz Rbb7PFY34SYuv9DY4YdnNhspQaoY8S5jkkYkmJ5AjdYOluPyhswU/i3O3X26Qf734uIY sQ6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6u6FkCPCfv4J7pdg4Ybljstse/ix+a86moRRp7mRqHM=; b=due9Q76a2VgKTPl6f02YEpuFOmfIQaE3x9x6eKfHlp/o4EaYi+ld+rZ4qceLRhVX5X fSFpyihu+KEczNEqt+oYsXoxnDd5xPiPcmXgI29CaR5pW+P8AfDt2FyiJDWgCOpxr/2A yYYACz+Rh0Hyemh0DESSJLFuontEGpADtqqBAs9jIQbu/IlXj75KLi7BW6JYmUMD7rqu ny+BjmuNDKmRf0Ua2PR9E/UdpiLYb9xKNVhgwdJ1DhJxocB3mf7MyM1/JrUwhqzt/h3o A9478pMAZyw256PvDfplBPQ4lAbuB1MLwEKqbrbPnVV6WEqouxI7Im5jOQ4PlZououZA bZFw== X-Gm-Message-State: AOAM533xtezJx1bSF57ycCnpDBIbp7HJSMjARdCcfcxkz53Sp87EproI oEy07uw/4FtohWXgSI3/RDE= X-Google-Smtp-Source: ABdhPJzSVH3Mnxdpn9YFOt4CPLgiUCSLVVw9mCHtXX79l7AP11X9GIpLmL8ENtNUOcz8kBIX8vxTNg== X-Received: by 2002:a63:191d:: with SMTP id z29mr1743341pgl.358.1639447788205; Mon, 13 Dec 2021 18:09:48 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:47 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 18/22] ASoC: qcom: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:39 +0900 Message-Id: <20211214020843.2225831-19-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/qcom/common.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 2e1c618f7529..e1bf04d00625 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -94,9 +94,8 @@ int qcom_snd_parse_of(struct snd_soc_card *card) ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name); if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(card->dev, "%s: error getting cpu dai name: %d\n", - link->name, ret); + dev_err_probe(card->dev, ret, + "%s: error getting cpu dai name\n", link->name); goto err; } @@ -116,9 +115,8 @@ int qcom_snd_parse_of(struct snd_soc_card *card) if (codec) { ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); if (ret < 0) { - if (ret != -EPROBE_DEFER) - dev_err(card->dev, "%s: codec dai not found: %d\n", - link->name, ret); + dev_err_probe(card->dev, ret, + "%s: codec dai not found\n", link->name); goto err; } From patchwork Tue Dec 14 02:08:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523688 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 591DFC433F5 for ; Tue, 14 Dec 2021 02:16:44 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A2ECB1F2A; Tue, 14 Dec 2021 03:15:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A2ECB1F2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448202; bh=iCSLQIV1p7eqSx0ID7CBYht3D+ADNuEBgCjXELq2UJk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=QAbwbLK4BwNdIM9Gf23hDHno0ZiFwkFNT3xaA4vnG6SP26GTrlIxySHwatQc2mWxG wCH2uEocghC6sATwrCRPiAa9kUvagSGZ3myYr5rVeQJyk4hgqycLPf9i/csnmdJauK 1FXN5SMxVcBXbg466xzbjBCJIbz1aLhaESjLmf5Q= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E2CC2F805C8; Tue, 14 Dec 2021 03:10:09 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 72337F805AC; Tue, 14 Dec 2021 03:10:06 +0100 (CET) Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E1C18F80557 for ; Tue, 14 Dec 2021 03:09:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E1C18F80557 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AI77NfqB" Received: by mail-pg1-x52a.google.com with SMTP id 200so7294307pgg.3 for ; Mon, 13 Dec 2021 18:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zn3f2v1RnSuzwZCr3P85CfLfluboubsWMDufKMeA5xQ=; b=AI77NfqBWPiy/8ceo0u3NOy8sb9hNK5V7eQNS/RE7CB35z7YqdXGN480caaZH56MAO QFRYR0rCrjte/vhOKN712euBPC2wXcadSkCVtkbjpCfO7yrtvep41V1/9g6rHiYPF4RC yKw/RAogOI7jx8bSdPiLlt5TJMp5iFO393s4blOOopSanQWEtd2k7x2mMkJOLw8fwGk5 Gs1uAEUGl16HvsszRGfPcniAx3kjMXaqLrc5yMozGj3hUgFOhl3bhUuiPMDTciewpd3a tLHkrC8Y6V3cKJhhAFm3pAck6Fkmje7TVy9i0NgcmsSpo92fJilyfTFNqysPwv2jtGdS g2xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Zn3f2v1RnSuzwZCr3P85CfLfluboubsWMDufKMeA5xQ=; b=xm5nmLmMZrSHh46iFpDQdiVAaMe6TSO9sDqcbeZ3+NuW3pYChURpAnhrvQ47uckPS0 7VN8R+4s1DVC9xNwTFAJXCG2cPCupuYt+5wa5ZQpN+JfQwxb1B5v9lw7O/xseGTiMwQK PXxHd8e+/gAbjhbP30L3UbMLRiF3SfPUSpeOL+NVkcT4gqYyZxLmZ/SRuHYiHDv3Teqr PopLnr71+nAjt0zVy+XEzIJuDT2UwFYiblcdsSPhjKIXF1iWRk/dUs38vXUyI3ZlKtz2 nI2WtooCSHckqGc/q2OCzFhaivM1Docog6ch++Q+wpyJf2l3P8e95CBFrNzGMYPCpOhT g2vA== X-Gm-Message-State: AOAM531NONgfe/PzbQKNd4KWsCdvD4g+tUURdvQwVoe7/D8oKF0aYwOL I/7wSYuzHnTlV6aIYaFfXi0= X-Google-Smtp-Source: ABdhPJy7wAA4qa+qw5W8KV452pWbeQ0veVVnNQHzvIxsfakLNvXDShCldkGy94SiC3NXZmtRJkL8xQ== X-Received: by 2002:a65:4c43:: with SMTP id l3mr1732831pgr.398.1639447789586; Mon, 13 Dec 2021 18:09:49 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:49 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 19/22] ASoC: rockchip: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:40 +0900 Message-Id: <20211214020843.2225831-20-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/rockchip/rk3288_hdmi_analog.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c index 33a00774746d..b052642ea620 100644 --- a/sound/soc/rockchip/rk3288_hdmi_analog.c +++ b/sound/soc/rockchip/rk3288_hdmi_analog.c @@ -249,13 +249,9 @@ static int snd_rk_mc_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, machine); ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret == -EPROBE_DEFER) - return -EPROBE_DEFER; - if (ret) { - dev_err(&pdev->dev, - "Soc register card failed %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Soc register card failed\n"); return ret; } From patchwork Tue Dec 14 02:08:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525050 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 990EBC433EF for ; Tue, 14 Dec 2021 02:16:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CD8D91B02; Tue, 14 Dec 2021 03:15:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CD8D91B02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448163; bh=G/gXzfcOae33cY/vE0/j3vTxh+cwnR1jyA3jx4MMVQQ=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=iOhS7h1ZuAgaMhAXspzPcV9IX+ym5UfK0B6JRk21SHS07mo0bt7SAjtZEdtXJX4wu 9deX58CShGNTFhohwGERxzJt93tudwt5zJU2H9U39SS2RKcCO/8+VMvG/lf+Al38T4 20+7AUaScUkHHpFKu8abggcmMgFcoCddp6acAT1o= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 74C3FF8050F; Tue, 14 Dec 2021 03:10:07 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id BB5A5F80589; Tue, 14 Dec 2021 03:10:03 +0100 (CET) Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 551C5F80552 for ; Tue, 14 Dec 2021 03:09:53 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 551C5F80552 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Anb5vi/3" Received: by mail-pj1-x102d.google.com with SMTP id gx15-20020a17090b124f00b001a695f3734aso14921207pjb.0 for ; Mon, 13 Dec 2021 18:09:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xYuF3cunzVF8DbiuvOSu5sxkCcpYnIGwnCywNS3hTk4=; b=Anb5vi/39ixVTX1HOgkwbTDhc7fD3qG8p4mFhbpqEkyJgIbidfmui3f+gMz5LayMzr AHmhIM3FlM4pQ1H4PElZwvfjuk1+ode7gHN9Tu0zXM0P1f4q/vFEipIg5QKl0Rr75FjO dDohsC2AoQImwleD6wsowNsTogyanFb+6pixggVSuFeoW9D4+Azm+nZSxMny2oHJwHwm WrOTjLaCPFswIm3eEDZs8Q6R5QOyGKV3rXMvY2lT+ymjsbPlV/0BgeUS5Iwjj3X/LTf+ 0LsvihDtmUegB7SxYrQ2bJu+e1kCWoO6njiRm6Kp8okdYC1UftFuNuZdmmfU94Ocbwwb 9a/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xYuF3cunzVF8DbiuvOSu5sxkCcpYnIGwnCywNS3hTk4=; b=GzODpfIfEnt4PXTD2iGA3zvV0Tg2q6aiggMrppEqZo7wv+pZZmDDVV9MaLqtB1ltaK 7W8H3fi3OobzAnPM9pAytj7ax+8NTQ9M0wT3nYikuWUfu85nlMSzNpmcMcdOrMKYSBVk YiFSHRPzi/YCBc1TyOyj7GGxhnNa/JVzcUrEx2vnf0wrAtCNKlGV78hjtgZ5QLcaxeJP KW2n7D5rGRVpbFOmocCCUYLz/00tJOQhvSZK0ZJpp3iWFNqGojFdYXERv3NOYCEXxrLZ P6mu72g3e7lfXW2ZOTKNbv6ZF1uW+/Bxt3ggnBVj64TUFLxUOyBslw6tzl1zyI4TgZLX rQ0A== X-Gm-Message-State: AOAM533rLUdQbf0hd4dYPsAtKtj6MFkbh1zFDlEZZaNxMZob4KEQccnD y8Njm+nSeeEwqnIiJbbWPk4= X-Google-Smtp-Source: ABdhPJxEFCzGChQLyEFZ/+1gQsHosqGqZNfte1nqYchP8M4/TIbWphZJHSmouHUbslSHPp2SFqro1Q== X-Received: by 2002:a17:90b:50c:: with SMTP id r12mr2290910pjz.71.1639447790933; Mon, 13 Dec 2021 18:09:50 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:50 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 20/22] ASoC: samsung: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:41 +0900 Message-Id: <20211214020843.2225831-21-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/aries_wm8994.c | 17 +++++++---------- sound/soc/samsung/arndale.c | 5 ++--- sound/soc/samsung/littlemill.c | 5 ++--- sound/soc/samsung/lowland.c | 5 ++--- sound/soc/samsung/odroid.c | 4 +--- sound/soc/samsung/smdk_wm8994.c | 4 ++-- sound/soc/samsung/smdk_wm8994pcm.c | 4 ++-- sound/soc/samsung/snow.c | 9 +++------ sound/soc/samsung/speyside.c | 5 ++--- sound/soc/samsung/tm2_wm5110.c | 3 +-- sound/soc/samsung/tobermory.c | 5 ++--- 11 files changed, 26 insertions(+), 40 deletions(-) diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index 313ab650f8d9..5265e546b124 100644 --- a/sound/soc/samsung/aries_wm8994.c +++ b/sound/soc/samsung/aries_wm8994.c @@ -585,19 +585,16 @@ static int aries_audio_probe(struct platform_device *pdev) extcon_np = of_parse_phandle(np, "extcon", 0); priv->usb_extcon = extcon_find_edev_by_node(extcon_np); - if (IS_ERR(priv->usb_extcon)) { - if (PTR_ERR(priv->usb_extcon) != -EPROBE_DEFER) - dev_err(dev, "Failed to get extcon device"); - return PTR_ERR(priv->usb_extcon); - } + if (IS_ERR(priv->usb_extcon)) + return dev_err_probe(dev, PTR_ERR(priv->usb_extcon), + "Failed to get extcon device"); of_node_put(extcon_np); priv->adc = devm_iio_channel_get(dev, "headset-detect"); - if (IS_ERR(priv->adc)) { - if (PTR_ERR(priv->adc) != -EPROBE_DEFER) - dev_err(dev, "Failed to get ADC channel"); - return PTR_ERR(priv->adc); - } + if (IS_ERR(priv->adc)) + return dev_err_probe(dev, PTR_ERR(priv->adc), + "Failed to get ADC channel"); + if (priv->adc->channel->type != IIO_VOLTAGE) return -EINVAL; diff --git a/sound/soc/samsung/arndale.c b/sound/soc/samsung/arndale.c index 606ac5e33a8e..a5dc640d0d76 100644 --- a/sound/soc/samsung/arndale.c +++ b/sound/soc/samsung/arndale.c @@ -174,9 +174,8 @@ static int arndale_audio_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(card->dev, card); if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, - "snd_soc_register_card() failed: %d\n", ret); + dev_err_probe(&pdev->dev, ret, + "snd_soc_register_card() failed\n"); goto err_put_of_nodes; } return 0; diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index 390f2dd735ad..34067cc314ff 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c @@ -325,9 +325,8 @@ static int littlemill_probe(struct platform_device *pdev) card->dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", - ret); + if (ret) + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n"); return ret; } diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index 998d10cf8c94..7b12ccd2a9b2 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c @@ -183,9 +183,8 @@ static int lowland_probe(struct platform_device *pdev) card->dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", - ret); + if (ret) + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n"); return ret; } diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index ca643a488c3c..4ff12e2e704f 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -311,9 +311,7 @@ static int odroid_audio_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(dev, card); if (ret < 0) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "snd_soc_register_card() failed: %d\n", - ret); + dev_err_probe(dev, ret, "snd_soc_register_card() failed\n"); goto err_put_clk_i2s; } diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 7661b637946d..821ad1eb1b79 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -179,8 +179,8 @@ static int smdk_audio_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret); + if (ret) + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n"); return ret; } diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c index 029448f5bedb..d77dc54cae9c 100644 --- a/sound/soc/samsung/smdk_wm8994pcm.c +++ b/sound/soc/samsung/smdk_wm8994pcm.c @@ -118,8 +118,8 @@ static int snd_smdk_probe(struct platform_device *pdev) smdk_pcm.dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret); + if (ret) + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n"); return ret; } diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 6da674e901ca..02372109c251 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -212,12 +212,9 @@ static int snow_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); ret = devm_snd_soc_register_card(dev, card); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, - "snd_soc_register_card failed (%d)\n", ret); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, + "snd_soc_register_card failed\n"); return ret; } diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index f5f6ba00d073..37b1f4f60b21 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -330,9 +330,8 @@ static int speyside_probe(struct platform_device *pdev) card->dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", - ret); + if (ret) + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n"); return ret; } diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index a2c77e6defec..d611ec9e5325 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -612,8 +612,7 @@ static int tm2_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(dev, card); if (ret < 0) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to register card: %d\n", ret); + dev_err_probe(dev, ret, "Failed to register card\n"); goto dai_node_put; } diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c index 15223d860cb7..8d3149a47a4c 100644 --- a/sound/soc/samsung/tobermory.c +++ b/sound/soc/samsung/tobermory.c @@ -229,9 +229,8 @@ static int tobermory_probe(struct platform_device *pdev) card->dev = &pdev->dev; ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", - ret); + if (ret) + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n"); return ret; } From patchwork Tue Dec 14 02:08:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 525049 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03CA4C433F5 for ; Tue, 14 Dec 2021 02:16:59 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3DC511F34; Tue, 14 Dec 2021 03:16:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3DC511F34 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448217; bh=lxAU7VGCnpr1v/qe6wfwLAdRvSE/Dndg9uHO+ubkWB8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=gjQR2xmghveu8+D3OtxH50xN5WtNT1XZIEZYOwn3gGTj0WlmxWa0NsZm8bq1cv25L T99OMzJuBgX5/D2sO7J+L+3UyCD60LZrT9AZBNoT+w6TXQJaANwc9THB0PpfJDR+ZN vD03Z5Q9w1Pspr3pk4V28GayF2WjBz4Bn0O3j7Vc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9BD4EF805D6; Tue, 14 Dec 2021 03:10:10 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A696EF805B2; Tue, 14 Dec 2021 03:10:07 +0100 (CET) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 498C9F80558 for ; Tue, 14 Dec 2021 03:09:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 498C9F80558 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f00kQMjN" Received: by mail-pl1-x633.google.com with SMTP id u17so12498167plg.9 for ; Mon, 13 Dec 2021 18:09:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bcdwNfmVIz+Zc7t7fhAOrKufC1ZzzEtCVOKmBYgFl/M=; b=f00kQMjNaZVLuKSPsaYz8XBW534TFLMV/YqZDz1slVt1ItEJr5cFzuwxsjINfXToT5 5qxhSZZd/QcWGO5HcYmw2eyotf7+THVD856u8lcCuHWssYwlmeLrjFIOftmtqgRdPsPY JEBhzXCVe0oLLv+3rciRQ0w1SgeziC/iNquKCJa4R2m8QnAkzYSvDTNKX0viezjhPY4X JmvIK22+3anOBii1od1TJ4szN4mLUHRBeK22gLggnM2O3qqKcrlkHsp1gafewwQm8m3e QbHl3+buOV28k+ucQfy1wZ3757a7cZtY4mcoQvA2qLeaRs/YcCgkfDvYXBFdAW8yEL4/ 56Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bcdwNfmVIz+Zc7t7fhAOrKufC1ZzzEtCVOKmBYgFl/M=; b=ioml67shIdKyTrIqfwTkX+OkV9gzfhGZ+5252nhnXPbF4ZTHGpmL4M5xMCKNC1K/Yt 8JQi3nOtCYe4wNRE9xdrgrbDI7TKvmFqeX1d2UxACL6un1u2KFB6dFzUIEFX34OR84Ch +1ujQMfJDs73itA5sRsG3bQ3M52I1JY1Ra1udFv8hOCQEMcA0YvpOFqFKn6Osh/hDDww 9YS5AoV/RwfhZyV9EwtITQ3tKoKhzrD2oibPMxo2JlQ/wfVmIhtKY60MD4564gq0+hdC 9ZuByJKDrlk/AiPJvD9ctobpidL1sN/X1NR4x/ZfeaHdFZx4Srf9BiXZhjM370cROqtD TXMg== X-Gm-Message-State: AOAM5321f46XOI6zHQzl0Ak6OkCPTbnDqGb2Do0yYiC5nyGACSC/3oH3 m06EPci5kcRRKOo5L2RwvW0= X-Google-Smtp-Source: ABdhPJwlyQ85z871/DBjtVjY8mpJVS8oRcEkcWeOvT0xNX4qnkfZg8OnW4RHxUnG1JI3x7NfpNJEiA== X-Received: by 2002:a17:90b:3ecc:: with SMTP id rm12mr2230080pjb.75.1639447792439; Mon, 13 Dec 2021 18:09:52 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:52 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 21/22] ASoC: stm: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:42 +0900 Message-Id: <20211214020843.2225831-22-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/stm/stm32_i2s.c | 62 ++++++++++++----------------------- sound/soc/stm/stm32_sai.c | 37 ++++++++------------- sound/soc/stm/stm32_sai_sub.c | 25 +++++--------- sound/soc/stm/stm32_spdifrx.c | 44 +++++++++---------------- 4 files changed, 57 insertions(+), 111 deletions(-) diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 24327cabd32a..ac5dff4d1677 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -1045,36 +1045,24 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev, /* Get clocks */ i2s->pclk = devm_clk_get(&pdev->dev, "pclk"); - if (IS_ERR(i2s->pclk)) { - if (PTR_ERR(i2s->pclk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Could not get pclk: %ld\n", - PTR_ERR(i2s->pclk)); - return PTR_ERR(i2s->pclk); - } + if (IS_ERR(i2s->pclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->pclk), + "Could not get pclk\n"); i2s->i2sclk = devm_clk_get(&pdev->dev, "i2sclk"); - if (IS_ERR(i2s->i2sclk)) { - if (PTR_ERR(i2s->i2sclk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Could not get i2sclk: %ld\n", - PTR_ERR(i2s->i2sclk)); - return PTR_ERR(i2s->i2sclk); - } + if (IS_ERR(i2s->i2sclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->i2sclk), + "Could not get i2sclk\n"); i2s->x8kclk = devm_clk_get(&pdev->dev, "x8k"); - if (IS_ERR(i2s->x8kclk)) { - if (PTR_ERR(i2s->x8kclk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Could not get x8k parent clock: %ld\n", - PTR_ERR(i2s->x8kclk)); - return PTR_ERR(i2s->x8kclk); - } + if (IS_ERR(i2s->x8kclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->x8kclk), + "Could not get x8k parent clock\n"); i2s->x11kclk = devm_clk_get(&pdev->dev, "x11k"); - if (IS_ERR(i2s->x11kclk)) { - if (PTR_ERR(i2s->x11kclk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Could not get x11k parent clock: %ld\n", - PTR_ERR(i2s->x11kclk)); - return PTR_ERR(i2s->x11kclk); - } + if (IS_ERR(i2s->x11kclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->x11kclk), + "Could not get x11k parent clock\n"); /* Register mclk provider if requested */ if (of_find_property(np, "#clock-cells", NULL)) { @@ -1097,12 +1085,10 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev, /* Reset */ rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); - if (IS_ERR(rst)) { - if (PTR_ERR(rst) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Reset controller error %ld\n", - PTR_ERR(rst)); - return PTR_ERR(rst); - } + if (IS_ERR(rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(rst), + "Reset controller error\n"); + reset_control_assert(rst); udelay(2); reset_control_deassert(rst); @@ -1145,21 +1131,15 @@ static int stm32_i2s_probe(struct platform_device *pdev) i2s->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "pclk", i2s->base, i2s->regmap_conf); - if (IS_ERR(i2s->regmap)) { - if (PTR_ERR(i2s->regmap) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Regmap init error %ld\n", - PTR_ERR(i2s->regmap)); - return PTR_ERR(i2s->regmap); - } + if (IS_ERR(i2s->regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->regmap), + "Regmap init error\n"); pm_runtime_enable(&pdev->dev); ret = snd_dmaengine_pcm_register(&pdev->dev, &stm32_i2s_pcm_config, 0); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "PCM DMA register error %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "PCM DMA register error\n"); ret = snd_soc_register_component(&pdev->dev, &stm32_i2s_component, i2s->dai_drv, 1); diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c index 058757c721f0..8e21e6f886fc 100644 --- a/sound/soc/stm/stm32_sai.c +++ b/sound/soc/stm/stm32_sai.c @@ -173,29 +173,20 @@ static int stm32_sai_probe(struct platform_device *pdev) if (!STM_SAI_IS_F4(sai)) { sai->pclk = devm_clk_get(&pdev->dev, "pclk"); - if (IS_ERR(sai->pclk)) { - if (PTR_ERR(sai->pclk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "missing bus clock pclk: %ld\n", - PTR_ERR(sai->pclk)); - return PTR_ERR(sai->pclk); - } + if (IS_ERR(sai->pclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(sai->pclk), + "missing bus clock pclk\n"); } sai->clk_x8k = devm_clk_get(&pdev->dev, "x8k"); - if (IS_ERR(sai->clk_x8k)) { - if (PTR_ERR(sai->clk_x8k) != -EPROBE_DEFER) - dev_err(&pdev->dev, "missing x8k parent clock: %ld\n", - PTR_ERR(sai->clk_x8k)); - return PTR_ERR(sai->clk_x8k); - } + if (IS_ERR(sai->clk_x8k)) + return dev_err_probe(&pdev->dev, PTR_ERR(sai->clk_x8k), + "missing x8k parent clock\n"); sai->clk_x11k = devm_clk_get(&pdev->dev, "x11k"); - if (IS_ERR(sai->clk_x11k)) { - if (PTR_ERR(sai->clk_x11k) != -EPROBE_DEFER) - dev_err(&pdev->dev, "missing x11k parent clock: %ld\n", - PTR_ERR(sai->clk_x11k)); - return PTR_ERR(sai->clk_x11k); - } + if (IS_ERR(sai->clk_x11k)) + return dev_err_probe(&pdev->dev, PTR_ERR(sai->clk_x11k), + "missing x11k parent clock\n"); /* init irqs */ sai->irq = platform_get_irq(pdev, 0); @@ -204,12 +195,10 @@ static int stm32_sai_probe(struct platform_device *pdev) /* reset */ rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); - if (IS_ERR(rst)) { - if (PTR_ERR(rst) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Reset controller error %ld\n", - PTR_ERR(rst)); - return PTR_ERR(rst); - } + if (IS_ERR(rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(rst), + "Reset controller error\n"); + reset_control_assert(rst); udelay(2); reset_control_deassert(rst); diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 95cd38a502bb..dd636af81c9b 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1379,12 +1379,9 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev, */ sai->regmap = devm_regmap_init_mmio(&pdev->dev, base, sai->regmap_config); - if (IS_ERR(sai->regmap)) { - if (PTR_ERR(sai->regmap) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Regmap init error %ld\n", - PTR_ERR(sai->regmap)); - return PTR_ERR(sai->regmap); - } + if (IS_ERR(sai->regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(sai->regmap), + "Regmap init error\n"); /* Get direction property */ if (of_property_match_string(np, "dma-names", "tx") >= 0) { @@ -1472,12 +1469,9 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev, of_node_put(args.np); sai->sai_ck = devm_clk_get(&pdev->dev, "sai_ck"); - if (IS_ERR(sai->sai_ck)) { - if (PTR_ERR(sai->sai_ck) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Missing kernel clock sai_ck: %ld\n", - PTR_ERR(sai->sai_ck)); - return PTR_ERR(sai->sai_ck); - } + if (IS_ERR(sai->sai_ck)) + return dev_err_probe(&pdev->dev, PTR_ERR(sai->sai_ck), + "Missing kernel clock sai_ck\n"); ret = clk_prepare(sai->pdata->pclk); if (ret < 0) @@ -1551,11 +1545,8 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) conf = &stm32_sai_pcm_config_spdif; ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "Could not register pcm dma\n"); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "Could not register pcm dma\n"); ret = snd_soc_register_component(&pdev->dev, &stm32_component, &sai->cpu_dai_drv, 1); diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index a9ccdc2c5867..6f7882c4fe6a 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -406,12 +406,9 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev, int ret; spdifrx->ctrl_chan = dma_request_chan(dev, "rx-ctrl"); - if (IS_ERR(spdifrx->ctrl_chan)) { - if (PTR_ERR(spdifrx->ctrl_chan) != -EPROBE_DEFER) - dev_err(dev, "dma_request_slave_channel error %ld\n", - PTR_ERR(spdifrx->ctrl_chan)); - return PTR_ERR(spdifrx->ctrl_chan); - } + if (IS_ERR(spdifrx->ctrl_chan)) + return dev_err_probe(dev, PTR_ERR(spdifrx->ctrl_chan), + "dma_request_slave_channel error\n"); spdifrx->dmab = devm_kzalloc(dev, sizeof(struct snd_dma_buffer), GFP_KERNEL); @@ -930,12 +927,9 @@ static int stm32_spdifrx_parse_of(struct platform_device *pdev, spdifrx->phys_addr = res->start; spdifrx->kclk = devm_clk_get(&pdev->dev, "kclk"); - if (IS_ERR(spdifrx->kclk)) { - if (PTR_ERR(spdifrx->kclk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Could not get kclk: %ld\n", - PTR_ERR(spdifrx->kclk)); - return PTR_ERR(spdifrx->kclk); - } + if (IS_ERR(spdifrx->kclk)) + return dev_err_probe(&pdev->dev, PTR_ERR(spdifrx->kclk), + "Could not get kclk\n"); spdifrx->irq = platform_get_irq(pdev, 0); if (spdifrx->irq < 0) @@ -987,12 +981,9 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) spdifrx->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "kclk", spdifrx->base, spdifrx->regmap_conf); - if (IS_ERR(spdifrx->regmap)) { - if (PTR_ERR(spdifrx->regmap) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Regmap init error %ld\n", - PTR_ERR(spdifrx->regmap)); - return PTR_ERR(spdifrx->regmap); - } + if (IS_ERR(spdifrx->regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(spdifrx->regmap), + "Regmap init error\n"); ret = devm_request_irq(&pdev->dev, spdifrx->irq, stm32_spdifrx_isr, 0, dev_name(&pdev->dev), spdifrx); @@ -1002,12 +993,10 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) } rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); - if (IS_ERR(rst)) { - if (PTR_ERR(rst) != -EPROBE_DEFER) - dev_err(&pdev->dev, "Reset controller error %ld\n", - PTR_ERR(rst)); - return PTR_ERR(rst); - } + if (IS_ERR(rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(rst), + "Reset controller error\n"); + reset_control_assert(rst); udelay(2); reset_control_deassert(rst); @@ -1016,11 +1005,8 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) pcm_config = &stm32_spdifrx_pcm_config; ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0); - if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "PCM DMA register error %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "PCM DMA register error\n"); ret = snd_soc_register_component(&pdev->dev, &stm32_spdifrx_component, From patchwork Tue Dec 14 02:08:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 523687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BDD4C433EF for ; Tue, 14 Dec 2021 02:17:17 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 777FD1F07; Tue, 14 Dec 2021 03:16:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 777FD1F07 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1639448235; bh=i/ozVA3TedLaoO1+Qxf6cKNDNgVnPGEG92p0OVprMoo=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=H+QYDirqwUoVj2yx9qQskhg2eDNcgZY4mc6ee97EuWb+hMYsc6gyUpOI57rHzrXVC DM21kXT/KieoskWkAildPZFh8hLR4SxmVJlS3qt41RxMJyeADV83E5+6vdUb91D574 wRffPJkZ1yx5hs8gTfoA0xUtOnMwRlbX3FjpBFko= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 37E0DF805D7; Tue, 14 Dec 2021 03:10:11 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DF007F805AF; Tue, 14 Dec 2021 03:10:07 +0100 (CET) Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AAE46F80568 for ; Tue, 14 Dec 2021 03:09:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AAE46F80568 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gHgti/dw" Received: by mail-pj1-x1035.google.com with SMTP id nh10-20020a17090b364a00b001a69adad5ebso14882225pjb.2 for ; Mon, 13 Dec 2021 18:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/Im/kxi8TreIZVGv64UW7tjZVlq5FhrglWgFTRZnlSg=; b=gHgti/dwXowgi3XwWVQ3Xd2DgbpvCaa2X1VcP7leme46jRJ/CrqvPjv4rRT1ZyQkii bV9I/coDfx4MQPgighp1TnR1zi18rdwUnDd9FiPacqJDSOSs9MH5SCW5DrXoQaLg8/y7 8BgxxkVk6JFnMUN3DO3b3POa+JeykCUryiGtnklaLsAsSqO4tYmOfILvZaGAzeM81op/ uTvP7QkRh6WAyJCbftTzk/vdJsjBrHDxPc+3wmVqijrWVGdu44eHVr1U4/vkjM8UiUBX rGcR3vdEuyIx8+rjCZ6fbGCG6zQYvRpLlGMPXa8r3CvNNmV3F/YQGaBZ100RMQk9+lvm YKDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/Im/kxi8TreIZVGv64UW7tjZVlq5FhrglWgFTRZnlSg=; b=mOClkbwJIhLqzESw5EyMT5AJRzjRv9WTjMWfQGc37pW+4AZsKENN+3jioF4N+N5sif 5y/bbgw7TlTQyZrG1Qen5RevRvKzNRmYDzrVnZ007nvybnW4Jf6YLXE2C9UcYygERkZ3 fhEh8Tw8rYqrdsfZPJX+KKb0VjSpxQlQnZ6blcWbP7ifblklu8P5fylhbQgzdR1DLk1k kj2dL3ATwggW0Yy/OOV22p96jQ9/ciMHBi2MMId1fq2DLLwnzw/lR62VKFu2jieRRVes 2wvYzxZ68ROSCHJtbYSpMJ/7fgGYMrh6sOPbSDhBIrFYq8MFQMAdPfXl1SSd4WM/sXaL fofQ== X-Gm-Message-State: AOAM532zyH17KdhObYmycJyxWfjIsYNCfjOaeiTO3Hsb+HrR1E2f0z4s Buaotclaq8sK+c8JEKMtR3k= X-Google-Smtp-Source: ABdhPJxhySLGzHmCguuyN7qrZ4zIsSYYDCJBzcVWylSYcNk5XaXyQYplsmkQauBuX6KVXgibDxangw== X-Received: by 2002:a17:90a:c58f:: with SMTP id l15mr2397674pjt.75.1639447793814; Mon, 13 Dec 2021 18:09:53 -0800 (PST) Received: from localhost.localdomain ([126.249.140.249]) by smtp.gmail.com with ESMTPSA id b2sm14622296pfv.198.2021.12.13.18.09.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 18:09:53 -0800 (PST) From: Kuninori Morimoto To: Mark Brown Subject: [PATCH 22/22] ASoC: sunxi: Use dev_err_probe() helper Date: Tue, 14 Dec 2021 11:08:43 +0900 Message-Id: <20211214020843.2225831-23-kuninori.morimoto.gx@renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> References: <20211214020843.2225831-1-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Kuninori Morimoto X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Kuninori Morimoto Use the dev_err_probe() helper, instead of open-coding the same operation. Signed-off-by: Kuninori Morimoto --- sound/soc/sunxi/sun4i-codec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index da597e456beb..60712f24ade5 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -1752,8 +1752,7 @@ static int sun4i_codec_probe(struct platform_device *pdev) GPIOD_OUT_LOW); if (IS_ERR(scodec->gpio_pa)) { ret = PTR_ERR(scodec->gpio_pa); - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "Failed to get pa gpio: %d\n", ret); + dev_err_probe(&pdev->dev, ret, "Failed to get pa gpio\n"); return ret; }