A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

serial: msm-geni-serial: Remove usage of wakeup_source_init API

Browse source 
Remove usage of wakeup_source_init API as the support for this
API is removed in wakeup.c file. Instead use wakeup_source_register
and wakeup_source_unregister APIs.

Change-Id: I0d7f759e6bf0388c713f7ffc4f157e61a25278be
Signed-off-by: Prudhvi Yarlagadda <pyarlaga@codeaurora.org>
This commit is contained in:
Prudhvi Yarlagadda 2019-10-21 18:32:05 +05:30
commit 07ee3ac09c
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/tty/serial/msm_geni_serial.c
View file

@ -148,7 +148,7 @@ struct msm_geni_serial_port {
int loopback;
int wakeup_irq;
unsigned char wakeup_byte;
struct wakeup_source geni_wake;
struct wakeup_source *geni_wake;
void *ipc_log_tx;
void *ipc_log_rx;
void *ipc_log_pwr;
@ -1490,7 +1490,7 @@ static irqreturn_t msm_geni_wakeup_isr(int isr, void *dev)
__func__, port->wakeup_byte);
port->edge_count = 0;
tty_flip_buffer_push(tty->port);
__pm_wakeup_event(&port->geni_wake, WAKEBYTE_TIMEOUT_MSEC);
__pm_wakeup_event(port->geni_wake, WAKEBYTE_TIMEOUT_MSEC);
} else if (port->edge_count < 2) {
port->edge_count++;
}
@ -2499,7 +2499,17 @@ static int msm_geni_serial_probe(struct platform_device *pdev)
}
}
wakeup_source_init(&dev_port->geni_wake, dev_name(&pdev->dev));
if (!is_console) {
dev_port->geni_wake = wakeup_source_register(uport->dev,
dev_name(&pdev->dev));
if (!dev_port->geni_wake) {
dev_err(&pdev->dev,
"Failed to register wakeup_source\n");
ret = -ENOMEM;
goto exit_geni_serial_probe;
}
}
dev_port->tx_fifo_depth = DEF_FIFO_DEPTH_WORDS;
dev_port->rx_fifo_depth = DEF_FIFO_DEPTH_WORDS;
dev_port->tx_fifo_width = DEF_FIFO_WIDTH_BITS;
@ -2550,7 +2560,8 @@ static int msm_geni_serial_remove(struct platform_device *pdev)
struct uart_driver *drv =
(struct uart_driver *)port->uport.private_data;
wakeup_source_remove(&port->geni_wake);
if (!uart_console(&port->uport))
wakeup_source_unregister(port->geni_wake);
uart_remove_one_port(drv, &port->uport);
return 0;
}
@ -2587,7 +2598,7 @@ static int msm_geni_serial_runtime_suspend(struct device *dev)
enable_irq(port->wakeup_irq);
}
IPC_LOG_MSG(port->ipc_log_pwr, "%s:\n", __func__);
__pm_relax(&port->geni_wake);
__pm_relax(port->geni_wake);
exit_runtime_suspend:
return ret;
}
@ -2602,8 +2613,8 @@ static int msm_geni_serial_runtime_resume(struct device *dev)
* Do an unconditional relax followed by a stay awake in case the
* wake source is activated by the wakeup isr.
*/
__pm_relax(&port->geni_wake);
__pm_stay_awake(&port->geni_wake);
__pm_relax(port->geni_wake);
__pm_stay_awake(port->geni_wake);
if (port->wakeup_irq > 0)
disable_irq(port->wakeup_irq);
/*
@ -2615,7 +2626,7 @@ static int msm_geni_serial_runtime_resume(struct device *dev)
ret = se_geni_resources_on(&port->serial_rsc);
if (ret) {
dev_err(dev, "%s: Error ret %d\n", __func__, ret);
__pm_relax(&port->geni_wake);
__pm_relax(port->geni_wake);
goto exit_runtime_resume;
}
start_rx_sequencer(&port->uport);