From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 29/50] drm/irq: simplify irq checks in drm_wait_vblank Date: Wed, 11 Dec 2013 11:34:50 +0100 Message-ID: <1386758111-3446-30-git-send-email-daniel.vetter@ffwll.ch> References: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f175.google.com (mail-ea0-f175.google.com [209.85.215.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 98830FB572 for ; Wed, 11 Dec 2013 02:35:08 -0800 (PST) Received: by mail-ea0-f175.google.com with SMTP id z10so2790882ead.20 for ; Wed, 11 Dec 2013 02:35:07 -0800 (PST) In-Reply-To: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: DRI Development Cc: Daniel Vetter List-Id: dri-devel@lists.freedesktop.org Checking for both an irq number _and_ whether it's enabled is redundant. Also this will breakd drivers which do their own irq management and just set dev->irq_enabled once the irq stuff is all set up. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index c0c6bdedefef..85d88cadc543 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1186,7 +1186,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, unsigned int flags, seq, crtc, high_crtc; if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) - if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled)) + if (!dev->irq_enabled) return -EINVAL; if (vblwait->request.type & _DRM_VBLANK_SIGNAL) -- 1.8.4.3