diff options
author | Ville Syrjälä <syrjala@sci.fi> | 2005-11-07 04:00:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:54 -0500 |
commit | b1e91fdf56930fd3bd11f0df26e686feabf65ebe (patch) | |
tree | 5847bf6895f0152b2766f674ae23af2113bd8297 /drivers/video/matrox | |
parent | 183dee0f02d878def016476afd7995bec8d5f3a6 (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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index e02da41f1b26..5f2df1725e6e 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) { | |||
264 | } | 264 | } |
265 | 265 | ||
266 | int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) { | 266 | int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) { |
267 | wait_queue_t __wait; | ||
268 | struct matrox_vsync *vs; | 267 | struct matrox_vsync *vs; |
269 | unsigned int cnt; | 268 | unsigned int cnt; |
270 | int ret; | 269 | int ret; |
@@ -286,7 +285,6 @@ int matroxfb_wait_for_sync(WPMINFO u_int32_t crtc) { | |||
286 | if (ret) { | 285 | if (ret) { |
287 | return ret; | 286 | return ret; |
288 | } | 287 | } |
289 | init_waitqueue_entry(&__wait, current); | ||
290 | 288 | ||
291 | cnt = vs->cnt; | 289 | cnt = vs->cnt; |
292 | ret = wait_event_interruptible_timeout(vs->wait, cnt != vs->cnt, HZ/10); | 290 | ret = wait_event_interruptible_timeout(vs->wait, cnt != vs->cnt, HZ/10); |