diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:16:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 09:16:37 -0700 |
| commit | 51d7cfc670e4c09e296af101326a6270060e72e7 (patch) | |
| tree | d18858aacd9634b71f543f6a187f313950a13432 /drivers/s390/char/raw3270.c | |
| parent | 5983b125740553d08a67d0c57e8c1021f5a06e31 (diff) | |
| parent | 3ecb0a5a7b567c9719d61938bcdba22938084b65 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: deregister ccw device when pgid disband failed
[S390] cio: Use device_schedule_callback() for removing disconnected devices.
[S390] Fix section annotations.
[S390] raw3270: use mutex instead of semaphore
[S390] arch/s390/kernel/debug.c: use mutex instead of semaphore
[S390] dasd_eer: use mutex instead of semaphore
[S390] Add exception handler for diagnose 224
Diffstat (limited to 'drivers/s390/char/raw3270.c')
| -rw-r--r-- | drivers/s390/char/raw3270.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index f6ef90ee3e7d..743944ad61ec 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c @@ -487,7 +487,7 @@ struct raw3270_ua { /* Query Reply structure for Usable Area */ } __attribute__ ((packed)); static struct diag210 raw3270_init_diag210; -static DECLARE_MUTEX(raw3270_init_sem); +static DEFINE_MUTEX(raw3270_init_mutex); static int raw3270_init_irq(struct raw3270_view *view, struct raw3270_request *rq, @@ -713,7 +713,7 @@ raw3270_size_device(struct raw3270 *rp) { int rc; - down(&raw3270_init_sem); + mutex_lock(&raw3270_init_mutex); rp->view = &raw3270_init_view; raw3270_init_view.dev = rp; if (MACHINE_IS_VM) @@ -722,7 +722,7 @@ raw3270_size_device(struct raw3270 *rp) rc = __raw3270_size_device(rp); raw3270_init_view.dev = NULL; rp->view = NULL; - up(&raw3270_init_sem); + mutex_unlock(&raw3270_init_mutex); if (rc == 0) { /* Found something. */ /* Try to find a model. */ rp->model = 0; @@ -749,7 +749,7 @@ raw3270_reset_device(struct raw3270 *rp) { int rc; - down(&raw3270_init_sem); + mutex_lock(&raw3270_init_mutex); memset(&rp->init_request, 0, sizeof(rp->init_request)); memset(&rp->init_data, 0, sizeof(rp->init_data)); /* Store reset data stream to init_data/init_request */ @@ -764,7 +764,7 @@ raw3270_reset_device(struct raw3270 *rp) rc = raw3270_start_init(rp, &raw3270_init_view, &rp->init_request); raw3270_init_view.dev = NULL; rp->view = NULL; - up(&raw3270_init_sem); + mutex_unlock(&raw3270_init_mutex); return rc; } |