From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 CA54AC433E2 for ; Fri, 28 Aug 2020 15:13:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1A49208C9 for ; Fri, 28 Aug 2020 15:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598627625; bh=rPCsaXfaJ8tMmGrgiB0WKcJSn4iPxStyfSWM6ySl1p8=; h=From:To:Cc:Subject:Date:List-ID:From; b=oonhEVuf45iJta2IcMQN8UETG/NZs1RYGcq75+Nq6OPulYtu1DCuXuS+cIPjzyPJb H59V3zdwcEb9bCc3HZolqrJcFtvBPu7FyFC69FOi4UM/WV9VmjKc+OkwZrLNEjFeqJ KI1PoS1ave4ZKx3EtDbKebMzefvW/RA0m5l3wdno= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728272AbgH1PNo (ORCPT ); Fri, 28 Aug 2020 11:13:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:59416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727867AbgH1PNl (ORCPT ); Fri, 28 Aug 2020 11:13:41 -0400 Received: from kozik-lap.mshome.net (unknown [194.230.155.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E07C208C9; Fri, 28 Aug 2020 15:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598627621; bh=rPCsaXfaJ8tMmGrgiB0WKcJSn4iPxStyfSWM6ySl1p8=; h=From:To:Cc:Subject:Date:From; b=DARVhXa3li9phBOgNWUfeg2fCJMjVpOKbCCZHgwV2fOGVIPW8647779WTR2CHgE/Y DPvV5Xh8Li+GlNAFkCfFUdRey9SyxEM3YKYo873lsc8zrjRQSxFhOkXd70RT29B9dg TsX74lPyiwxdZ5YVPsy5nEdXfibiMOHZkgXxgmUs= From: Krzysztof Kozlowski To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] extcon: palmas: Simplify with dev_err_probe() Date: Fri, 28 Aug 2020 17:13:37 +0200 Message-Id: <20200828151337.6748-1-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed. Signed-off-by: Krzysztof Kozlowski --- drivers/extcon/extcon-palmas.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index e8e9eebe6b1d..a2852bcc5f0d 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -205,21 +205,15 @@ static int palmas_usb_probe(struct platform_device *pdev) palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id", GPIOD_IN); - if (PTR_ERR(palmas_usb->id_gpiod) == -EPROBE_DEFER) { - return -EPROBE_DEFER; - } else if (IS_ERR(palmas_usb->id_gpiod)) { - dev_err(&pdev->dev, "failed to get id gpio\n"); - return PTR_ERR(palmas_usb->id_gpiod); - } + if (IS_ERR(palmas_usb->id_gpiod)) + return dev_err_probe(&pdev->dev, PTR_ERR(palmas_usb->id_gpiod), + "failed to get id gpio\n"); palmas_usb->vbus_gpiod = devm_gpiod_get_optional(&pdev->dev, "vbus", GPIOD_IN); - if (PTR_ERR(palmas_usb->vbus_gpiod) == -EPROBE_DEFER) { - return -EPROBE_DEFER; - } else if (IS_ERR(palmas_usb->vbus_gpiod)) { - dev_err(&pdev->dev, "failed to get vbus gpio\n"); - return PTR_ERR(palmas_usb->vbus_gpiod); - } + if (IS_ERR(palmas_usb->vbus_gpiod)) + return dev_err_probe(&pdev->dev, PTR_ERR(palmas_usb->vbus_gpiod), + "failed to get id gpio\n"); if (palmas_usb->enable_id_detection && palmas_usb->id_gpiod) { palmas_usb->enable_id_detection = false; -- 2.17.1