From patchwork Wed Mar 30 13:36:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 8696361 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 97391C0553 for ; Wed, 30 Mar 2016 13:36:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D572A20382 for ; Wed, 30 Mar 2016 13:36:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EF2A02037E for ; Wed, 30 Mar 2016 13:36:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D2E666E7F8; Wed, 30 Mar 2016 13:36:48 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from metis.ext.4.pengutronix.de (metis.ext.4.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31CD36E7F8 for ; Wed, 30 Mar 2016 13:36:46 +0000 (UTC) Received: from paszta.hi.pengutronix.de ([2001:67c:670:100:96de:80ff:fec2:9969] helo=paszta) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1alGIa-0002Ti-9m; Wed, 30 Mar 2016 15:36:40 +0200 Message-ID: <1459344995.2505.37.camel@pengutronix.de> From: Philipp Zabel To: Daniel Vetter Date: Wed, 30 Mar 2016 15:36:35 +0200 In-Reply-To: <1459331485-28376-9-git-send-email-daniel.vetter@ffwll.ch> References: <1459331485-28376-1-git-send-email-daniel.vetter@ffwll.ch> <1459331485-28376-9-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:96de:80ff:fec2:9969 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: intel-gfx@lists.freedesktop.org Cc: Russell King , Intel Graphics Development , DRI Development , Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 08/10] drm/imx: Don't set a gamma table size X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Daniel, Am Mittwoch, den 30.03.2016, 11:51 +0200 schrieb Daniel Vetter: > imx doesn't have any functions for setting the gamma table, so this is > completely defunct. > > Not nice to lie to userspace, so let's stop! Thank you for the patch. Now the ret variable and the err_register label are both unused, so I have applied it with the following fixup: regards Philipp diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 21a5293..e26dcde 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -326,7 +326,6 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc, { struct imx_drm_device *imxdrm = drm->dev_private; struct imx_drm_crtc *imx_drm_crtc; - int ret; /* * The vblank arrays are dimensioned by MAX_CRTC - we can't @@ -358,11 +357,6 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc, imx_drm_crtc->imx_drm_helper_funcs.crtc_funcs, NULL); return 0; - -err_register: - imxdrm->crtc[--imxdrm->pipes] = NULL; - kfree(imx_drm_crtc); - return ret; } EXPORT_SYMBOL_GPL(imx_drm_add_crtc);