From patchwork Thu Jun 22 09:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 111596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4946663vqr; Thu, 22 Jun 2023 02:57:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7h3+ojnWH8Li2zRDSEPukn281fHM/0k1iK4YKcvC4ZrhMjiuPzCHpadz8LftfwHYJnooXP X-Received: by 2002:a17:903:2584:b0:1ae:4ee3:e3e6 with SMTP id jb4-20020a170903258400b001ae4ee3e3e6mr11207241plb.32.1687427850223; Thu, 22 Jun 2023 02:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687427850; cv=none; d=google.com; s=arc-20160816; b=WrJdK1PtZAYGrVmNgRe3+fyX0LIqAGndZacj6pfek3WAT+jc4+a7aYxbcDnR2yaQXZ RQ3PDH45r5D0uVq4Wz9VjnNndUcdkL3jyaiFtLSZIGCtVmnnVukUtLXCH01jwYvW4pIQ IvgoCkl8JnwP/0PkIb0j8TQuuEnxXnuhWjmvWkZTQ5g86niZccB/sBRCiwEvFq5eNFLa vdnWMas94T6GVjuzJmGULtECC89duxfRm16leotNC0PNYQ2FM2hnMD8fy/pvTvmBlbhz 42XLC7g2jRTEx/VbTnTu+mBkt+tJHJifEGEAOHIx4cZpa4PnsFEaouXw/SKZIYrgHlHS 2M/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Jez54VkB6yycPTtUxfXItxGXigY2mnajtPAdEDIKmbs=; b=Mi1oB7SQymyFb/VLItaWsi93PlPfHqfrXUpU9PX4amYNPyS2TCB8yAhzXqlt7MK3JH ce2fxUFLvkSn1VS+XZgNbdgT/nuxrbjv4AyxY6LPY3u/g0s6+kj+RL7xpwWepTZj8TPF shLf/roP9k36po+W3FOX0MuuoO3FqqcvAKSpXbC6j9Cp/pMsyygrCktZmQZhmV6CVYnV G2+9lE6r9T35uZVhFXedIU0eDBiGVwM/zzLdSfHFcuZWkiQes/KMePME85Yp0dKxi6Qx 1qZo9ICE3cEvchFd1GRUJUUdmuixfXo2MZ/GfcJ1se35ijwOmMVamUIo5ndyaKYzwfdV Nn7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020a170903024700b001b66f1fcf0csi6965990plh.174.2023.06.22.02.57.12; Thu, 22 Jun 2023 02:57:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229687AbjFVJaO (ORCPT + 99 others); Thu, 22 Jun 2023 05:30:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231897AbjFVJ3k (ORCPT ); Thu, 22 Jun 2023 05:29:40 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 627474218 for ; Thu, 22 Jun 2023 02:22:45 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed20:991a:a831:ea4b:6058]) by michel.telenet-ops.be with bizsmtp id C9Nj2A00H1yfRTD069NjCz; Thu, 22 Jun 2023 11:22:43 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qCGWX-000BwA-Mv; Thu, 22 Jun 2023 11:22:43 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qCGWZ-003Vwj-9x; Thu, 22 Jun 2023 11:22:43 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 15/39] drm: renesas: shmobile: Improve error handling Date: Thu, 22 Jun 2023 11:21:27 +0200 Message-Id: <100c650ab37ae09a142a93afa3734400a6a96757.1687423204.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769396345336381518?= X-GMAIL-MSGID: =?utf-8?q?1769396345336381518?= Prepare for DT conversion, where panel probe can be deferred, by streamlining error propagation and handling: - Use dev_err_probe() to avoid printing error messages in case of probe deferral, - Propagate errors where needed. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 3 ++- drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index 9aa9800899976a23..50fca18282c5cb5e 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -228,7 +228,8 @@ static int shmob_drm_probe(struct platform_device *pdev) ret = shmob_drm_modeset_init(sdev); if (ret < 0) { - dev_err(&pdev->dev, "failed to initialize mode setting\n"); + dev_err_probe(&pdev->dev, ret, + "failed to initialize mode setting\n"); goto err_free_drm_dev; } diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c index 3051318ddc7999bc..1a62e7f8a8a9e6df 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c @@ -157,9 +157,17 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev) if (ret) return ret; - shmob_drm_crtc_create(sdev); - shmob_drm_encoder_create(sdev); - shmob_drm_connector_create(sdev, &sdev->encoder); + ret = shmob_drm_crtc_create(sdev); + if (ret < 0) + return ret; + + ret = shmob_drm_encoder_create(sdev); + if (ret < 0) + return ret; + + ret = shmob_drm_connector_create(sdev, &sdev->encoder); + if (ret < 0) + return ret; drm_kms_helper_poll_init(sdev->ddev);