Skip to content

Commit a2bceae

Browse files
Alan CoxLive-CD User
Alan Cox
authored and
Live-CD User
committed
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: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1 parent a030068 commit a2bceae

File tree

3 files changed

+123
-114
lines changed

3 files changed

+123
-114
lines changed

‎drivers/serial/pmac_zilog.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
16451645
state = pmz_uart_reg.state + uap->port.line;
16461646

16471647
mutex_lock(&pmz_irq_mutex);
1648-
mutex_lock(&state->mutex);
1648+
mutex_lock(&state->port.mutex);
16491649

16501650
spin_lock_irqsave(&uap->port.lock, flags);
16511651

@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
16761676
/* Shut the chip down */
16771677
pmz_set_scc_power(uap, 0);
16781678

1679-
mutex_unlock(&state->mutex);
1679+
mutex_unlock(&state->port.mutex);
16801680
mutex_unlock(&pmz_irq_mutex);
16811681

16821682
pmz_debug("suspend, switching complete\n");
@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev)
17051705
state = pmz_uart_reg.state + uap->port.line;
17061706

17071707
mutex_lock(&pmz_irq_mutex);
1708-
mutex_lock(&state->mutex);
1708+
mutex_lock(&state->port.mutex);
17091709

17101710
spin_lock_irqsave(&uap->port.lock, flags);
17111711
if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) {
@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev)
17371737
}
17381738

17391739
bail:
1740-
mutex_unlock(&state->mutex);
1740+
mutex_unlock(&state->port.mutex);
17411741
mutex_unlock(&pmz_irq_mutex);
17421742

17431743
/* Right now, we deal with delay by blocking here, I'll be

0 commit comments

Comments
 (0)