Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp878588imm; Wed, 10 Oct 2018 05:52:31 -0700 (PDT) X-Google-Smtp-Source: ACcGV63jt80yQWKiSWVPmcE/Pe37Tj9b9DxwgjRy6P9eL1Riwc7UMtP5FXyoKPIzgJAyXthH5DCN X-Received: by 2002:a17:902:7109:: with SMTP id a9-v6mr32950401pll.310.1539175951669; Wed, 10 Oct 2018 05:52:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539175951; cv=none; d=google.com; s=arc-20160816; b=XvRlusCQDCSFKkCTqcFYqbTb/JgWxRwGMsaMnuCnCZmXmjOyD0zmn3WNGqI/jLL8RP 3wkHv7eEw2aKYftUXUTSRsOruTHMCjr8DcWulvLl8WZd7M0c+pgL43pgI9ySKBvOod1K 0MLepVjC8N3swgjc1ewV2egpgd154LbhgV0Mb5yNtwJqQvf2Q1eizAPcjOQK1UPUwx0B zb86rxlw6GtL+WeH9rdPSBwqC4Ec87K57oeMD3fdACeYMNJaTVIAqKtKUy49HzrrZjVw lJEtaOWtIi1I/DixAlF91ybz+90JvZ1oABUq+NvqyK1lwiAnGaDW07mGvKoLZX/mC6Gz YOvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from; bh=DYBVR96aCCNLev+DeC6v9XWgLc1ZU5Y3k2lv9RIpvtU=; b=EvPwhGQ37oCLp5Ku0Uvq7l1nx/20flP7hIdZ+j+lbvr2/zMo3joBXa5bRGhiEd9oln hJGSlYK9EFs+ksnckgYfTKw8+w2Mhnn8It0TLb0p2rWKuHBMjGHsl/7k6HSH7KxebbQC XX974dti9p04B+WPux4oIbv8m4iwKBnWgzcW4Idqb3OYi/4osAqQNM0dDcrOLbB56Ggw lGu0TnlLoyMDQNFR16xP7ycOmNA5jwC1c3ohyW4FUr5ybb4uY/Ze0A6gTRghKiO0vAHN hi1xcxsDfMvinLI7JSfDX6MYwRoZ5+7KxUWmVfwn9Od70YSQPJX0OXGx2wQMPyvql+wQ X9WQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y11-v6si8570271pfm.141.2018.10.10.05.52.16; Wed, 10 Oct 2018 05:52:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726836AbeJJUNj (ORCPT + 99 others); Wed, 10 Oct 2018 16:13:39 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13611 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726573AbeJJUNj (ORCPT ); Wed, 10 Oct 2018 16:13:39 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2007BA22C240B; Wed, 10 Oct 2018 20:51:33 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.399.0; Wed, 10 Oct 2018 20:51:27 +0800 From: YueHaibing To: Gustavo Padovan , Maarten Lankhorst , Sean Paul , "David Airlie" CC: YueHaibing , , , Subject: [PATCH -next] drm: Use PTR_ERR_OR_ZERO in drm_fb_cma_fbdev_init() Date: Wed, 10 Oct 2018 13:02:43 +0000 Message-ID: <1539176563-144779-1-git-send-email-yuehaibing@huawei.com> X-Mailer: git-send-email 1.8.3.1 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Signed-off-by: YueHaibing --- drivers/gpu/drm/drm_fb_cma_helper.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index fb0dfc6..30741eb 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -124,10 +124,7 @@ int drm_fb_cma_fbdev_init(struct drm_device *dev, unsigned int preferred_bpp, /* dev->fb_helper will indirectly point to fbdev_cma after this call */ fbdev_cma = drm_fbdev_cma_init(dev, preferred_bpp, max_conn_count); - if (IS_ERR(fbdev_cma)) - return PTR_ERR(fbdev_cma); - - return 0; + return PTR_ERR_OR_ZERO(fbdev_cma); } EXPORT_SYMBOL_GPL(drm_fb_cma_fbdev_init);