With Hansjoerg Lipp <hjlipp@web.de>
Convert the semaphores used by the Gigaset drivers to mutexes.
Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+ mutex_lock(&cs->mutex);
f_bcs: gig_dbg(DEBUG_INIT, "freeing bcs[]");
kfree(cs->bcs);
f_cs: gig_dbg(DEBUG_INIT, "freeing cs");
f_bcs: gig_dbg(DEBUG_INIT, "freeing bcs[]");
kfree(cs->bcs);
f_cs: gig_dbg(DEBUG_INIT, "freeing cs");
+ mutex_unlock(&cs->mutex);
free_cs(cs);
}
EXPORT_SYMBOL_GPL(gigaset_freecs);
free_cs(cs);
}
EXPORT_SYMBOL_GPL(gigaset_freecs);
spin_lock_init(&cs->ev_lock);
atomic_set(&cs->ev_tail, 0);
atomic_set(&cs->ev_head, 0);
spin_lock_init(&cs->ev_lock);
atomic_set(&cs->ev_tail, 0);
atomic_set(&cs->ev_head, 0);
- init_MUTEX_LOCKED(&cs->sem);
+ mutex_init(&cs->mutex);
+ mutex_lock(&cs->mutex);
+
tasklet_init(&cs->event_tasklet, &gigaset_handle_event,
(unsigned long) cs);
atomic_set(&cs->commands_pending, 0);
tasklet_init(&cs->event_tasklet, &gigaset_handle_event,
(unsigned long) cs);
atomic_set(&cs->commands_pending, 0);
add_timer(&cs->timer);
gig_dbg(DEBUG_INIT, "cs initialized");
add_timer(&cs->timer);
gig_dbg(DEBUG_INIT, "cs initialized");
+ mutex_unlock(&cs->mutex);
return cs;
error: if (cs)
return cs;
error: if (cs)
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_INIT, "failed");
gigaset_freecs(cs);
return NULL;
gig_dbg(DEBUG_INIT, "failed");
gigaset_freecs(cs);
return NULL;
int gigaset_start(struct cardstate *cs)
{
int gigaset_start(struct cardstate *cs)
{
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return 0;
atomic_set(&cs->connected, 1);
return 0;
atomic_set(&cs->connected, 1);
/* set up device sysfs */
gigaset_init_dev_sysfs(cs);
/* set up device sysfs */
gigaset_init_dev_sysfs(cs);
+ mutex_unlock(&cs->mutex);
+ mutex_unlock(&cs->mutex);
return 0;
}
EXPORT_SYMBOL_GPL(gigaset_start);
void gigaset_shutdown(struct cardstate *cs)
{
return 0;
}
EXPORT_SYMBOL_GPL(gigaset_start);
void gigaset_shutdown(struct cardstate *cs)
{
+ mutex_lock(&cs->mutex);
+ mutex_unlock(&cs->mutex);
}
EXPORT_SYMBOL_GPL(gigaset_shutdown);
void gigaset_stop(struct cardstate *cs)
{
}
EXPORT_SYMBOL_GPL(gigaset_shutdown);
void gigaset_stop(struct cardstate *cs)
{
+ mutex_lock(&cs->mutex);
/* clear device sysfs */
gigaset_free_dev_sysfs(cs);
/* clear device sysfs */
gigaset_free_dev_sysfs(cs);
+ mutex_unlock(&cs->mutex);
}
EXPORT_SYMBOL_GPL(gigaset_stop);
}
EXPORT_SYMBOL_GPL(gigaset_stop);
int cs_init;
int ignoreframes; /* frames to ignore after setting up the
B channel */
int cs_init;
int ignoreframes; /* frames to ignore after setting up the
B channel */
- struct semaphore sem; /* locks this structure:
+ struct mutex mutex; /* locks this structure:
* connected is not changed,
* hardware_up is not changed,
* MState is not changed to or from
* connected is not changed,
* hardware_up is not changed,
* MState is not changed to or from
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
tty->low_latency = 1; //FIXME test
}
tty->low_latency = 1; //FIXME test
}
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
+ mutex_lock(&cs->mutex);
if (!cs->open_count)
warn("%s: device not opened", __func__);
if (!cs->open_count)
warn("%s: device not opened", __func__);
+ mutex_unlock(&cs->mutex);
}
static int if_ioctl(struct tty_struct *tty, struct file *file,
}
static int if_ioctl(struct tty_struct *tty, struct file *file,
gig_dbg(DEBUG_IF, "%u: %s(0x%x)", cs->minor_index, __func__, cmd);
gig_dbg(DEBUG_IF, "%u: %s(0x%x)", cs->minor_index, __func__, cmd);
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
// FIXME read from device?
retval = cs->control_state & (TIOCM_RTS|TIOCM_DTR);
return -ERESTARTSYS; // FIXME -EINTR?
// FIXME read from device?
retval = cs->control_state & (TIOCM_RTS|TIOCM_DTR);
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_IF, "%u: %s(0x%x, 0x%x)",
cs->minor_index, __func__, set, clear);
gig_dbg(DEBUG_IF, "%u: %s(0x%x, 0x%x)",
cs->minor_index, __func__, set, clear);
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
if (!atomic_read(&cs->connected)) {
return -ERESTARTSYS; // FIXME -EINTR?
if (!atomic_read(&cs->connected)) {
cs->control_state = mc;
}
cs->control_state = mc;
}
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
} else
retval = cs->ops->write_room(cs);
} else
retval = cs->ops->write_room(cs);
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
return -ERESTARTSYS; // FIXME -EINTR?
if (!cs->open_count)
} else
retval = cs->ops->chars_in_buffer(cs);
} else
retval = cs->ops->chars_in_buffer(cs);
+ mutex_unlock(&cs->mutex);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
+ mutex_lock(&cs->mutex);
if (!cs->open_count)
warn("%s: device not opened", __func__);
if (!cs->open_count)
warn("%s: device not opened", __func__);
+ mutex_unlock(&cs->mutex);
}
static void if_unthrottle(struct tty_struct *tty)
}
static void if_unthrottle(struct tty_struct *tty)
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
+ mutex_lock(&cs->mutex);
if (!cs->open_count)
warn("%s: device not opened", __func__);
if (!cs->open_count)
warn("%s: device not opened", __func__);
+ mutex_unlock(&cs->mutex);
}
static void if_set_termios(struct tty_struct *tty, struct termios *old)
}
static void if_set_termios(struct tty_struct *tty, struct termios *old)
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
+ mutex_lock(&cs->mutex);
if (!cs->open_count) {
warn("%s: device not opened", __func__);
if (!cs->open_count) {
warn("%s: device not opened", __func__);
cs->control_state = control_state;
out:
cs->control_state = control_state;
out:
+ mutex_unlock(&cs->mutex);
if (value < 0 || value > 1)
return -EINVAL;
if (value < 0 || value > 1)
return -EINVAL;
- if (down_interruptible(&cs->sem))
+ if (mutex_lock_interruptible(&cs->mutex))
return -ERESTARTSYS; // FIXME -EINTR?
cs->waiting = 1;
if (!gigaset_add_event(cs, &cs->at_state, EV_PROC_CIDMODE,
NULL, value, NULL)) {
cs->waiting = 0;
return -ERESTARTSYS; // FIXME -EINTR?
cs->waiting = 1;
if (!gigaset_add_event(cs, &cs->at_state, EV_PROC_CIDMODE,
NULL, value, NULL)) {
cs->waiting = 0;
+ mutex_unlock(&cs->mutex);
wait_event(cs->waitqueue, !cs->waiting);
wait_event(cs->waitqueue, !cs->waiting);
+ mutex_unlock(&cs->mutex);