aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/matrox
diff options
context:
space:
mode:
authorVille Syrjälä <syrjala@sci.fi>2005-11-07 01:00:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:54 -0800
commitb1e91fdf56930fd3bd11f0df26e686feabf65ebe (patch)
tree5847bf6895f0152b2766f674ae23af2113bd8297 /drivers/video/matrox
parent183dee0f02d878def016476afd7995bec8d5f3a6 (diff)
[PATCH] matroxfb: Remove an unused wait queue entry
wait_event_event_interruptible() uses a private wait queue entry so there's no need for the caller to initialize one. Signed-off-by: Ville Syrjälä <syrjala@sci.fi> Signed-off-by: Petr Vandrovec <petr@vandrovec.name> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/matrox')
-rw-r--r--drivers/video/matrox/matroxfb_base.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index e02da41f1b2..5f2df1725e6 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -264,7 +264,6 @@ static void matroxfb_disable_irq(WPMINFO2) {
}
int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
- wait_queue_t __wait;
struct matrox_vsync *vs;
unsigned int cnt;
int ret;
@@ -286,7 +285,6 @@ int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) {
if (ret) {
return ret;
}
- init_waitqueue_entry(&__wait, current);
cnt = vs->cnt;
ret = wait_event_interruptible_timeout(vs->wait, cnt != vs->cnt, HZ/10);