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=-10.1 required=3.0 tests=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 162FFC433E0 for ; Fri, 22 May 2020 14:57:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DBA05206C3 for ; Fri, 22 May 2020 14:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590159459; bh=g3sscGhPq9hLVmx658tAsrUj80UrMHlDSMwYPWU6Ecw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u9QqatXNMITqcm4PEKW1LfrvnZbN7HRN9i+BoPLpaDK2c0zUy/Tq01yj7vGA/H+Av ubvfgL0jyc5uqMDIf/z/M9jG/KoA2SrFI/Wio2E3vwOWWmm+k9npstius+0RxootZ9 uSxQXMe0pOJNUPgotbR4d6JgTcvU1mD6wX/qb9Bo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731037AbgEVO5j (ORCPT ); Fri, 22 May 2020 10:57:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:51978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730134AbgEVOui (ORCPT ); Fri, 22 May 2020 10:50:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 5E25E22228; Fri, 22 May 2020 14:50:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590159038; bh=g3sscGhPq9hLVmx658tAsrUj80UrMHlDSMwYPWU6Ecw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hn7/42dZz3E8n/HI7ExYkgoOgqeUm8FwLXALMgeieFw8QGEAviNwZ8TzMMA/WtPkq 53XX1yd7cs7KfNUeFZOaSQmYzhaGPulowyQV7eMJklTUabvQ1gO1r2qWS2L66JlyDA fzzkwHSB7pS3lOnKv+PHBX2C4KIsHdPv4TwJdmPQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bernard Zhao , Neil Armstrong , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.6 35/41] drm/meson: pm resume add return errno branch Date: Fri, 22 May 2020 10:49:52 -0400 Message-Id: <20200522144959.434379-35-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200522144959.434379-1-sashal@kernel.org> References: <20200522144959.434379-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bernard Zhao [ Upstream commit c54a8f1f329197d83d941ad84c4aa38bf282cbbd ] pm_resump api did not handle drm_mode_config_helper_resume error. This change add handle to return drm_mode_config_helper_resume`s error number. This code logic is aligned with api pm_suspend. After this change, the code maybe a bit readable. Signed-off-by: Bernard Zhao Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20200428131747.2099-1-bernard@vivo.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/meson/meson_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index b5f5eb7b4bb9..8c2e1b47e81a 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) if (priv->afbcd.ops) priv->afbcd.ops->init(priv); - drm_mode_config_helper_resume(priv->drm); - - return 0; + return drm_mode_config_helper_resume(priv->drm); } static int compare_of(struct device *dev, void *data) -- 2.25.1