From patchwork Wed May 19 06:34:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2h1bmZlbmcgWXVuICjkupHmmKXls7Ap?= X-Patchwork-Id: 12266403 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E3DAC433B4 for ; Wed, 19 May 2021 06:41:19 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7FC960FE4 for ; Wed, 19 May 2021 06:41:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7FC960FE4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ozkSRw+7e6o+C3TC2RkvC3Iz6vTGbSf319Ko4q0rJME=; b=hdtpu5a0WdXyLR7lQCNAXV/Pd bl+aBc8txHaGdelRxRVRyU9CkkB97+vRatcd0EwrlHAXrUcFsWeyRSdSOLRWNV/f20uO6Z1ZQnfG1 qjjSdK8wuPH5ZdAjc7IRtnJ0vhYSK+oxgYz//6yPswWmJcptAhbmFOTdDGNEjgMgnnaVlQt6xHSd5 xEavPcAmOZB9bKGmuP7V/7y2I+ZMU3GX0WgkaBUFDjlo90Olk5Hah0b90zktvPGBkxsdOJhdTGCsB 1vbX0qpmFoXLQCbJLrjVtgFVQZvCHrJIthKx5MlBT68L7W0Ks3Ulqb7EoG9xNYKtjjYVu7DaD2E7c 5KG8Fz7Tw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljFr9-00314j-8y; Wed, 19 May 2021 06:39:01 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljFr5-00314J-D2; Wed, 19 May 2021 06:38:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=jYh7zL2Ctfmwpb/jYXcNM13KNhb4dHl5kzVLMnmkvAc=; b=1A0bErRZBI6ZwO8/Vc0ZWnYfAd StSHLNjt9juVfJq5WVf4Wl1WlP7xx7DW+Jic4gbppaFGfLLlTZDWOlOIl3200dlGc+fsQ5CDCfPnH wlKfLsDLX6o+irjHrxK+FPqbXJxXuXO02CUUrwANHo2GrBcjAj0rHjuY2BQd6V0y12OTl8tKYe3+Z mEKCy512B6u9l9NfYv9/76A/TE5poFFfpB48rMhfmNMY+nWTXv73CV/gH2MUO/5SHkovMBkQzFZiq eZYAvx+tMtfOGrtf0K9UiJh+TYBC4RU7Ff2Sj9zeqJ5p98/jZwKIh5LcKHkCLdnBQ/7fElPIOhW8+ o2kyWmOQ==; Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljFr1-00FBYF-0s; Wed, 19 May 2021 06:38:53 +0000 X-UUID: 4342b91610624556843afba3642e5394-20210518 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=jYh7zL2Ctfmwpb/jYXcNM13KNhb4dHl5kzVLMnmkvAc=; b=bTTjLbCoaYAAmjHmRSaYmPcZZEMtNZSW0Ad8wzgw0LprNtYXCOsHTqOEXbrRJQQv9LoIMvzaWgGQ92ANlURZUFD2IMvXv1HUtg30Q+KMm5kRNQH/Jnay98/wvnNr3YS99qaNC4J/dI+Y4LfXa3wPGI5BIGWguBfrBWU5M8oYpBc=; X-UUID: 4342b91610624556843afba3642e5394-20210518 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1648345234; Tue, 18 May 2021 23:38:48 -0700 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 18 May 2021 23:34:22 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 19 May 2021 14:34:18 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 19 May 2021 14:34:18 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Thierry Reding CC: Liam Girdwood , Mark Brown , Matthias Brugger , Chunfeng Yun , Paul Cercueil , Lee Jones , , , , Subject: [PATCH 2/3] usb: common: usb-conn-gpio: use dev_err_probe() to print log Date: Wed, 19 May 2021 14:34:14 +0800 Message-ID: <1621406055-18749-2-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1621406055-18749-1-git-send-email-chunfeng.yun@mediatek.com> References: <1621406055-18749-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 834019DAF55A3585D8007107D5C15830EA56476F357C7886A1BAC557F4CD4F1F2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_233852_570487_8250514A X-CRM114-Status: GOOD ( 15.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use dev_err_probe() to print debug or error message depending on whether the error value is -DPROBE_DEFER or not. Signed-off-by: Chunfeng Yun --- drivers/usb/common/usb-conn-gpio.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c index c9545a4eff66..dfbbc4f51ed6 100644 --- a/drivers/usb/common/usb-conn-gpio.c +++ b/drivers/usb/common/usb-conn-gpio.c @@ -223,18 +223,14 @@ static int usb_conn_probe(struct platform_device *pdev) } if (IS_ERR(info->vbus)) { - if (PTR_ERR(info->vbus) != -EPROBE_DEFER) - dev_err(dev, "failed to get vbus: %ld\n", PTR_ERR(info->vbus)); - return PTR_ERR(info->vbus); + ret = PTR_ERR(info->vbus); + return dev_err_probe(dev, ret, "failed to get vbus :%d\n", ret); } info->role_sw = usb_role_switch_get(dev); - if (IS_ERR(info->role_sw)) { - if (PTR_ERR(info->role_sw) != -EPROBE_DEFER) - dev_err(dev, "failed to get role switch\n"); - - return PTR_ERR(info->role_sw); - } + if (IS_ERR(info->role_sw)) + return dev_err_probe(dev, PTR_ERR(info->role_sw), + "failed to get role switch\n"); ret = usb_conn_psy_register(info); if (ret)