Commit a2bceae0 authored by Alan Cox's avatar Alan Cox Committed by Live-CD User

serial: replace the state mutex with the tty port mutex

They cover essentially the same stuff and we can therefore fold it into the
tty_port one.
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a0300686
...@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state) ...@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
state = pmz_uart_reg.state + uap->port.line; state = pmz_uart_reg.state + uap->port.line;
mutex_lock(&pmz_irq_mutex); mutex_lock(&pmz_irq_mutex);
mutex_lock(&state->mutex); mutex_lock(&state->port.mutex);
spin_lock_irqsave(&uap->port.lock, flags); spin_lock_irqsave(&uap->port.lock, flags);
...@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state) ...@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
/* Shut the chip down */ /* Shut the chip down */
pmz_set_scc_power(uap, 0); pmz_set_scc_power(uap, 0);
mutex_unlock(&state->mutex); mutex_unlock(&state->port.mutex);
mutex_unlock(&pmz_irq_mutex); mutex_unlock(&pmz_irq_mutex);
pmz_debug("suspend, switching complete\n"); pmz_debug("suspend, switching complete\n");
...@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev) ...@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev)
state = pmz_uart_reg.state + uap->port.line; state = pmz_uart_reg.state + uap->port.line;
mutex_lock(&pmz_irq_mutex); mutex_lock(&pmz_irq_mutex);
mutex_lock(&state->mutex); mutex_lock(&state->port.mutex);
spin_lock_irqsave(&uap->port.lock, flags); spin_lock_irqsave(&uap->port.lock, flags);
if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) { if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) {
...@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev) ...@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev)
} }
bail: bail:
mutex_unlock(&state->mutex); mutex_unlock(&state->port.mutex);
mutex_unlock(&pmz_irq_mutex); mutex_unlock(&pmz_irq_mutex);
/* Right now, we deal with delay by blocking here, I'll be /* Right now, we deal with delay by blocking here, I'll be
......
This diff is collapsed.
...@@ -351,8 +351,6 @@ struct uart_state { ...@@ -351,8 +351,6 @@ struct uart_state {
struct tasklet_struct tlet; struct tasklet_struct tlet;
wait_queue_head_t delta_msr_wait; wait_queue_head_t delta_msr_wait;
struct uart_port *uart_port; struct uart_port *uart_port;
struct mutex mutex;
}; };
#define UART_XMIT_SIZE PAGE_SIZE #define UART_XMIT_SIZE PAGE_SIZE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment