drivers/gpu/drm/i915/i915_irq.c: fix warning

akpm00 · torvalds · commit 9c84ba4e5021 · 2008-12-01T19:55:25.000-08:00
drivers/gpu/drm/i915/i915_irq.c: In function 'i915_disable_pipestat':
drivers/gpu/drm/i915/i915_irq.c:101: warning: control may reach end of non-void function 'i915_pipestat' being inlined

Cc: Dave Airlie &lt;airlied@linux.ie&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
@@ -78,7 +78,7 @@ i915_pipestat(int pipe)
 		return PIPEASTAT;
 	if (pipe == 1)
 		return PIPEBSTAT;
-	BUG_ON(1);
+	BUG();
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ i915_pipestat(int pipe)`
`78`	`78`	`return PIPEASTAT;`
`79`	`79`	`if (pipe == 1)`
`80`	`80`	`return PIPEBSTAT;`
`81`		`- BUG_ON(1);`
	`81`	`+ BUG();`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`void`