s390/cio: wait_cons_dev don't use static variable

wait_cons_dev is used to busy wait for an interrupt on the console
ccw device. Stop using the static console_subchannel and add a
parameter to this function to specify on which ccw device/subchannel
we have to do the polling.

While at it rename the function to ccw_device_wait_idle and
move it to device.c

Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 4c9030a5b9f2..383d6432a1a8 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -796,7 +796,7 @@ struct raw3270 __init *raw3270_setup_console(struct ccw_device *cdev)
         do {
                 __raw3270_reset_device(rp);
                 while (!raw3270_state_final(rp)) {
-                        wait_cons_dev();
+                        ccw_device_wait_idle(rp->cdev);
                         barrier();
                 }
         } while (rp->state != RAW3270_STATE_READY);
@@ -810,7 +810,7 @@ raw3270_wait_cons_dev(struct raw3270 *rp)
         unsigned long flags;
 
         spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);
-        wait_cons_dev();
+        ccw_device_wait_idle(rp->cdev);
         spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
 }