s390/cio: use DECLARE_WAIT_QUEUE_HEAD for static work_queue_head_t

[sfrench/cifs-2.6.git] / drivers / s390 / cio / chp.c

diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 8d0de6adcad0801cc3bc628a5fad3a6328596850..e42113825415283f137745dd844dfdda768ac9b9 100644 (file)
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -50,7 +50,7 @@ static unsigned long chp_info_expires;
 static struct work_struct cfg_work;
 
 /* Wait queue for configure completion events. */
-static wait_queue_head_t cfg_wait_queue;
+static DECLARE_WAIT_QUEUE_HEAD(cfg_wait_queue);
 
 /* Set vary state for given chpid. */
 static void set_chp_logically_online(struct chp_id chpid, int onoff)
@@ -829,7 +829,6 @@ static int __init chp_init(void)
        if (ret)
                return ret;
        INIT_WORK(&cfg_work, cfg_func);
-       init_waitqueue_head(&cfg_wait_queue);
        if (info_update())
                return 0;
        /* Register available channel-paths. */