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 /arch/s390/include | |
| parent | 91c15a951091a64a5f048ff93292057e3b590b6f (diff) | |
| download | linux-stable-188561a462d3b82451d6ba09e2e32c9ba2c9938c.tar.gz linux-stable-188561a462d3b82451d6ba09e2e32c9ba2c9938c.tar.bz2 linux-stable-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 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/ccwdev.h | 1 | ||||
| -rw-r--r-- | arch/s390/include/asm/cio.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h index e6061617a50b..cb56fb6cff7e 100644 --- a/arch/s390/include/asm/ccwdev.h +++ b/arch/s390/include/asm/ccwdev.h @@ -220,6 +220,7 @@ extern void ccw_device_get_id(struct ccw_device *, struct ccw_dev_id *); #define to_ccwdrv(n) container_of(n, struct ccw_driver, driver) extern struct ccw_device *ccw_device_probe_console(void); +extern void ccw_device_wait_idle(struct ccw_device *); extern int ccw_device_force_console(void); int ccw_device_siosl(struct ccw_device *); diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h index ad2b924167d7..ffb898961c8d 100644 --- a/arch/s390/include/asm/cio.h +++ b/arch/s390/include/asm/cio.h @@ -296,8 +296,6 @@ static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1, return 0; } -extern void wait_cons_dev(void); - extern void css_schedule_reprobe(void); extern void reipl_ccw_dev(struct ccw_dev_id *id); |