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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 963C4C433E0 for ; Tue, 2 Feb 2021 12:12:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F93C64E43 for ; Tue, 2 Feb 2021 12:12:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231437AbhBBMMG (ORCPT ); Tue, 2 Feb 2021 07:12:06 -0500 Received: from mail-m17640.qiye.163.com ([59.111.176.40]:48152 "EHLO mail-m17640.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231429AbhBBMLf (ORCPT ); Tue, 2 Feb 2021 07:11:35 -0500 Received: from ubuntu.localdomain (unknown [157.0.31.124]) by mail-m17640.qiye.163.com (Hmail) with ESMTPA id B83F75402D9; Tue, 2 Feb 2021 20:10:45 +0800 (CST) From: Bernard Zhao To: Xinliang Liu , Tian Tao , John Stultz , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , Laurent Pinchart , Tomi Valkeinen , Sam Ravnborg , Boris Brezillon , Bernard Zhao , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH] drm/hisilicon: remove redundant when devm_kzalloc failed Date: Tue, 2 Feb 2021 04:10:37 -0800 Message-Id: <20210202121039.14945-1-bernard@vivo.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZS0wYGk9CTRpPSkxOVkpNSklJTUxDT01LQkNVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hNSlVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6OhQ6Sxw*TD8INTYsFD9KEQMp PklPCwxVSlVKTUpJSU1MQ09NT0xPVTMWGhIXVRkeCRUaCR87DRINFFUYFBZFWVdZEgtZQVlKTkxV S1VISlVKSU9ZV1kIAVlBSU5NTDcG X-HM-Tid: 0a7762a6f996d995kuwsb83f75402d9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Line 852 DRM_ERROR is redundant because memory alloc already prints an error when failed. Signed-off-by: Bernard Zhao --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 00e87c290796..8491d8267f07 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -852,10 +852,9 @@ static int dsi_probe(struct platform_device *pdev) int ret; data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); - if (!data) { - DRM_ERROR("failed to allocate dsi data.\n"); + if (!data) return -ENOMEM; - } + dsi = &data->dsi; ctx = &data->ctx; dsi->ctx = ctx; -- 2.29.0 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 729B9C433E0 for ; Wed, 3 Feb 2021 08:14:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 25DF564F67 for ; Wed, 3 Feb 2021 08:14:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25DF564F67 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=vivo.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 811686EA05; Wed, 3 Feb 2021 08:13:19 +0000 (UTC) Received: from mail-m17640.qiye.163.com (mail-m17640.qiye.163.com [59.111.176.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id D740A6E105 for ; Tue, 2 Feb 2021 12:10:50 +0000 (UTC) Received: from ubuntu.localdomain (unknown [157.0.31.124]) by mail-m17640.qiye.163.com (Hmail) with ESMTPA id B83F75402D9; Tue, 2 Feb 2021 20:10:45 +0800 (CST) From: Bernard Zhao To: Xinliang Liu , Tian Tao , John Stultz , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , Laurent Pinchart , Tomi Valkeinen , Sam Ravnborg , Boris Brezillon , Bernard Zhao , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/hisilicon: remove redundant when devm_kzalloc failed Date: Tue, 2 Feb 2021 04:10:37 -0800 Message-Id: <20210202121039.14945-1-bernard@vivo.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZS0wYGk9CTRpPSkxOVkpNSklJTUxDT01LQkNVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hNSlVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6OhQ6Sxw*TD8INTYsFD9KEQMp PklPCwxVSlVKTUpJSU1MQ09NT0xPVTMWGhIXVRkeCRUaCR87DRINFFUYFBZFWVdZEgtZQVlKTkxV S1VISlVKSU9ZV1kIAVlBSU5NTDcG X-HM-Tid: 0a7762a6f996d995kuwsb83f75402d9 X-Mailman-Approved-At: Wed, 03 Feb 2021 08:13:07 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: opensource.kernel@vivo.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Line 852 DRM_ERROR is redundant because memory alloc already prints an error when failed. Signed-off-by: Bernard Zhao --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 00e87c290796..8491d8267f07 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -852,10 +852,9 @@ static int dsi_probe(struct platform_device *pdev) int ret; data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); - if (!data) { - DRM_ERROR("failed to allocate dsi data.\n"); + if (!data) return -ENOMEM; - } + dsi = &data->dsi; ctx = &data->ctx; dsi->ctx = ctx; -- 2.29.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel