[PATCH]remove warning for drivers/gpu/drm/i915/intel_ringbuffer.c

[PATCH]remove warning for drivers/gpu/drm/i915/intel_ringbuffer.c

[Harry Wei]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=unknown-8bit, Size: 1356 bytes --]

From: Harry Wei <harryxiyou@gmail.com>
When i compile kernel, it shows me two warnings
like below, so this patch can fix them. 

[...]
CC [M]  drivers/gpu/drm/i915/intel_dvo.o
CC [M]  drivers/gpu/drm/i915/intel_ringbuffer.o
drivers/gpu/drm/i915/intel_ringbuffer.c:603: warning: ���ring_get_irq��� defined but not used
drivers/gpu/drm/i915/intel_ringbuffer.c:620: warning: ���ring_put_irq��� defined but not used
CC [M]  drivers/gpu/drm/i915/intel_overlay.o
CC [M]  drivers/gpu/drm/i915/intel_opregion.o
[...]


Signed-off-by: Harry Wei <harryxiyou@gmail.com>

Index: prj/drivers/gpu/drm/i915/intel_ringbuffer.c
===================================================================
--- prj.orig/drivers/gpu/drm/i915/intel_ringbuffer.c	2011-06-03 20:37:35.523539547 +0800
+++ prj/drivers/gpu/drm/i915/intel_ringbuffer.c	2011-06-03 20:38:07.279539574 +0800
@@ -599,23 +599,6 @@
 	return 0;
 }
 
-static bool
-ring_get_irq(struct intel_ring_buffer *ring, u32 flag)
-{
-	struct drm_device *dev = ring->dev;
-	drm_i915_private_t *dev_priv = dev->dev_private;
-
-	if (!dev->irq_enabled)
-	       return false;
-
-	spin_lock(&ring->irq_lock);
-	if (ring->irq_refcount++ == 0)
-		ironlake_enable_irq(dev_priv, flag);
-	spin_unlock(&ring->irq_lock);
-
-	return true;
-}
-
 static void
 ring_put_irq(struct intel_ring_buffer *ring, u32 flag)
 {

Re: [PATCH]remove warning for drivers/gpu/drm/i915/intel_ringbuffer.c

[Keith Packard]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

On Fri, 3 Jun 2011 21:09:39 +0800, Harry Wei <jiaweiwei.xiyou@gmail.com> wrote:

(process:18294): gmime-CRITICAL **: g_mime_stream_filter_add: assertion `GMIME_IS_FILTER (filter)' failed
> From: Harry Wei <harryxiyou@gmail.com>
> When i compile kernel, it shows me two warnings
> like below, so this patch can fix them.

This fix is already upstream; it wasn't included in the stable patch
as it wasn't 'necessary' to fix the bug which is causing the warning
(which ended up removing the last use of this function).

-- 
keith.packard@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH]remove warning for drivers/gpu/drm/i915/intel_ringbuffer.c

[Harry Wei]

On Fri, Jun 03, 2011 at 10:36:55AM -0700, Keith Packard wrote:
> On Fri, 3 Jun 2011 21:09:39 +0800, Harry Wei <jiaweiwei.xiyou@gmail.com> wrote:
> 
> > From: Harry Wei <harryxiyou@gmail.com>
> > When i compile kernel, it shows me two warnings
> > like below, so this patch can fix them.
> 
> This fix is already upstream; it wasn't included in the stable patch
> as it wasn't 'necessary' to fix the bug which is causing the warning
> (which ended up removing the last use of this function).
Hmmm..., i see.

Thanks
Harry Wei