]> err.no Git - linux-2.6/commitdiff
[PATCH] matroxfb: Remove an unused wait queue entry
authorVille Syrjälä <syrjala@sci.fi>
Mon, 7 Nov 2005 09:00:56 +0000 (01:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 15:53:54 +0000 (07:53 -0800)
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>
drivers/video/matrox/matroxfb_base.c

index e02da41f1b262b9cb780dd19d4d36767ccdbe357..5f2df1725e6e9612a7f695c77ae62b6e8a1da247 100644 (file)
@@ -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);