From patchwork Tue Jul 18 16:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 122152 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1896925vqt; Tue, 18 Jul 2023 10:21:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlEKIf10JxagcwqSnEfV6eP8V41o2gqymq3QGIdmJ+Renc9g6r4swrmHOs2vGLgG19TWjeZh X-Received: by 2002:a17:907:847:b0:997:6729:619 with SMTP id ww7-20020a170907084700b0099767290619mr558477ejb.29.1689700912808; Tue, 18 Jul 2023 10:21:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689700912; cv=none; d=google.com; s=arc-20160816; b=hegk7iSTiDGZP+Veg4QQYg5wlTPmE7MnQF7EyZ+ecNuhpdA3ffIzFGVaPDjfuj8ra7 ChI/kLxLPmGnhXsbCPMHHOAERO6KN4IBhIfDqZDhgao4fSXe9hmZlIJgNGq/aIEOKlFM hZbSLxg5dV8jfcYoAOTCxgnpS1HcHpP5LZtTzgW4qTqJh8qyKyo8+z2qMWYsMlJEk3YI DldKr2uLM3Fgh1BiN4kJuQNZkmAsAPUWLncsqipBa6YNnYm35G8V7s6DLwYAgcqDAT4C RmCdjRRCVNoY9UrKG3RofT6D8QruOWKOHDnyMzDmZQZAWIdR5mBNL1dJsGmMcwIgqoQQ 08/w== 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=W5WkYdW5Gvy0HcFU9SzQRl7yqyslRGaS9rUSiP+g7Q8=; fh=Ople2ijcDVdvBJwvAg2RvyZp0qNZK7It46SN0LxlrVk=; b=EwHDAEq/IkLig0XS/Gr3Ke1XFdrkIL6cag4gJNHRkzVPNo7dTnFl2WouyXrmVBsKEh uizQJRAPdaJIR/mH6OXhvVsz3T/aMYdgbKJRU1xVNxZxrPl0JJ0Ki0TZmg9cO7+Utgaz WoLK9M99iLIOA/2t19VgLATfEXP3GiglO/d0LyKbxKyKQQS1zMX2XHyFbSUNApFIdTl8 bkjEKymfOo533TpcHpC/NLERHkDSf40DRmJuZCQ5tlPqLCMiLfsNrpxO6KKn6LkC+euP yiEPDHqtJeTwAMQQDHen2zlEOpVo/6jXGP4ONl112bP7eLFQHYOC4gl2jZyWBoTeDdQA HkCQ== 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 ke8-20020a17090798e800b0099212b34e82si1515745ejc.18.2023.07.18.10.21.28; Tue, 18 Jul 2023 10:21:52 -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 S233578AbjGRQzq (ORCPT + 99 others); Tue, 18 Jul 2023 12:55:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232544AbjGRQzA (ORCPT ); Tue, 18 Jul 2023 12:55:00 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01F591711 for ; Tue, 18 Jul 2023 09:54:54 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5803:2d6d:5bbc:e252]) by laurent.telenet-ops.be with bizsmtp id Ngur2A0070ucMBo01gurj7; Tue, 18 Jul 2023 18:54:53 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qLnyD-001nYU-Aw; Tue, 18 Jul 2023 18:54:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qLnyN-000gcO-C2; Tue, 18 Jul 2023 18:54:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH v2 16/41] drm: renesas: shmobile: Improve error handling Date: Tue, 18 Jul 2023 18:54:21 +0200 Message-Id: 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=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771779824685017235 X-GMAIL-MSGID: 1771779824685017235 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 --- v2: - Add Reviewed-by. --- 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 782767fc66d00c4f..91daab80b0ede058 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -255,7 +255,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);