From: Vineeth Vijayan Date: Mon, 29 Mar 2021 18:38:07 +0000 (+0200) Subject: s390/cio: use DECLARE_WAIT_QUEUE_HEAD for static work_queue_head_t X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3081e6160565078b3a37ebb33bd8301ab18dd6d7;p=linux.git s390/cio: use DECLARE_WAIT_QUEUE_HEAD for static work_queue_head_t Use DECLARE_WAIT_QUEUE_HEAD to declare and statically initialize the work_queue_head_t. Signed-off-by: Vineeth Vijayan Reviewed-by: Peter Oberparleiter Signed-off-by: Heiko Carstens --- diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index 8d0de6adcad08..e421138254152 100644 --- 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. */