From patchwork Tue Oct 2 13:10:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1536981 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 1E9393FDAE for ; Tue, 2 Oct 2012 13:12:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0930A0A7B for ; Tue, 2 Oct 2012 06:12:39 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id BD4209E959 for ; Tue, 2 Oct 2012 06:10:05 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hj13so674428wib.12 for ; Tue, 02 Oct 2012 06:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=CSezuHWfv02LW3HazyoH40H0JI/Z8A7Op191rAijnHE=; b=GtHYw5JI6yycPHGXZ+NdwtZPpINEVs20v/Mo+hndYd3QgTzE1bsgUS393BEE8iB08t 6Go0WMacRnQ45qR5/roThrU+iPv5/o81+/+jSKfAdoEPuAL2+NqHsHh39KW1tDwecM6Z RPLqhqumPwc580RacebBA0jSUhmrO9q1rfBA4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=CSezuHWfv02LW3HazyoH40H0JI/Z8A7Op191rAijnHE=; b=AlZ64WynYDAiqnl7FmBaShpdIrq2E/+juxbuYYwnIEEzAH+3M1UVLQ1pXYCMOylF3e 1iQxSdOc7J02Sp3h2PseiPQL/yiuClrByMyM4kZv1XImojYT0nH+AHW83To/FsiYqUnw y63wVCSelhw4IubbmiPijNDamj7I+Z9qx66KqIZCU7E1tv4sAJHBUVO9NUOkFyA7QaNz +o73XaTDfDFiOXs7zok/gXrIplkA90zWEMMqMD5D9BamyJltUh1QgKMIYVjclZQhpvWI R/7kcqy1hZol07VJVzB4PR4mbw69AAn5cxDKlL9V+rQZpH/uzSuiceVXUccgBYLvIy/+ tciQ== Received: by 10.180.79.34 with SMTP id g2mr16607363wix.19.1349183404917; Tue, 02 Oct 2012 06:10:04 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id gm7sm2360892wib.10.2012.10.02.06.10.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 06:10:03 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 2 Oct 2012 15:10:55 +0200 Message-Id: <1349183455-3885-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQlVBZttE1NYB3RMiU4rAMl0CRdH/MQqhEA4LT+F8FJyBvHof6kno/yz3wqVkq8sJID1I4GV Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: s/DRM_IRQ_ARSG/int irq, void *arg X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org I'm official fed up with the yelling and useless indirection. Let if burn! Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_irq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index f7ec794..337c5cd 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -521,7 +521,7 @@ static void gen6_queue_rps_work(struct drm_i915_private *dev_priv, queue_work(dev_priv->wq, &dev_priv->rps.work); } -static irqreturn_t valleyview_irq_handler(DRM_IRQ_ARGS) +static irqreturn_t valleyview_irq_handler(int irq, void *arg) { struct drm_device *dev = (struct drm_device *) arg; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -671,7 +671,7 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir) I915_READ(FDI_RX_IIR(pipe))); } -static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS) +static irqreturn_t ivybridge_irq_handler(int irq, void *arg) { struct drm_device *dev = (struct drm_device *) arg; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -746,7 +746,7 @@ static void ilk_gt_irq_handler(struct drm_device *dev, notify_ring(dev, &dev_priv->ring[VCS]); } -static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS) +static irqreturn_t ironlake_irq_handler(int irq, void *arg) { struct drm_device *dev = (struct drm_device *) arg; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -2120,7 +2120,7 @@ static int i8xx_irq_postinstall(struct drm_device *dev) return 0; } -static irqreturn_t i8xx_irq_handler(DRM_IRQ_ARGS) +static irqreturn_t i8xx_irq_handler(int irq, void *arg) { struct drm_device *dev = (struct drm_device *) arg; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -2298,7 +2298,7 @@ static int i915_irq_postinstall(struct drm_device *dev) return 0; } -static irqreturn_t i915_irq_handler(DRM_IRQ_ARGS) +static irqreturn_t i915_irq_handler(int irq, void *arg) { struct drm_device *dev = (struct drm_device *) arg; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -2536,7 +2536,7 @@ static int i965_irq_postinstall(struct drm_device *dev) return 0; } -static irqreturn_t i965_irq_handler(DRM_IRQ_ARGS) +static irqreturn_t i965_irq_handler(int irq, void *arg) { struct drm_device *dev = (struct drm_device *) arg; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;