diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2013-04-13 12:53:21 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-04-17 14:07:30 +0200 |
| commit | 188561a462d3b82451d6ba09e2e32c9ba2c9938c (patch) | |
| tree | ced10861aad02cad5cac0e232c8c85964dd2dc1f /drivers/s390/char/con3215.c | |
| parent | 91c15a951091a64a5f048ff93292057e3b590b6f (diff) | |
| download | lwn-188561a462d3b82451d6ba09e2e32c9ba2c9938c.tar.gz lwn-188561a462d3b82451d6ba09e2e32c9ba2c9938c.zip | |
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>
Diffstat (limited to 'drivers/s390/char/con3215.c')
| -rw-r--r-- | drivers/s390/char/con3215.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 7b00fa634d40..0d79eec799f1 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -502,7 +502,7 @@ static void raw3215_make_room(struct raw3215_info *raw, unsigned int length) raw3215_try_io(raw); raw->flags &= ~RAW3215_FLUSHING; #ifdef CONFIG_TN3215_CONSOLE - wait_cons_dev(); + ccw_device_wait_idle(raw->cdev); #endif /* Enough room freed up ? */ if (RAW3215_BUFFER_SIZE - raw->count >= length) |