summaryrefslogtreecommitdiff
path: root/patches.tizen/0339-tty-serial-samsung-Remove-useless-checks-in-suspend-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches.tizen/0339-tty-serial-samsung-Remove-useless-checks-in-suspend-.patch')
-rw-r--r--patches.tizen/0339-tty-serial-samsung-Remove-useless-checks-in-suspend-.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/patches.tizen/0339-tty-serial-samsung-Remove-useless-checks-in-suspend-.patch b/patches.tizen/0339-tty-serial-samsung-Remove-useless-checks-in-suspend-.patch
new file mode 100644
index 00000000000..3b0a80399f7
--- /dev/null
+++ b/patches.tizen/0339-tty-serial-samsung-Remove-useless-checks-in-suspend-.patch
@@ -0,0 +1,75 @@
+From fd312d212145a18638622d590ae8697ad4f74919 Mon Sep 17 00:00:00 2001
+From: Tomasz Figa <t.figa@samsung.com>
+Date: Wed, 8 May 2013 18:30:30 +0200
+Subject: [PATCH 0339/1302] tty: serial: samsung: Remove useless checks in
+ suspend/resume callbacks
+
+Since uart_port struct exists through whole driver lifetime, there is no
+need to check if it is non-NULL in suspend/resume callbacks.
+
+Signed-off-by: Tomasz Figa <t.figa@samsung.com>
+Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
+---
+ drivers/tty/serial/samsung.c | 31 +++++++++++++------------------
+ 1 file changed, 13 insertions(+), 18 deletions(-)
+
+diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
+index 0c8a9fa..12bb5d8 100644
+--- a/drivers/tty/serial/samsung.c
++++ b/drivers/tty/serial/samsung.c
+@@ -1307,8 +1307,7 @@ static int s3c24xx_serial_suspend(struct device *dev)
+ {
+ struct uart_port *port = s3c24xx_dev_to_port(dev);
+
+- if (port)
+- uart_suspend_port(&s3c24xx_uart_drv, port);
++ uart_suspend_port(&s3c24xx_uart_drv, port);
+
+ return 0;
+ }
+@@ -1318,13 +1317,11 @@ static int s3c24xx_serial_resume(struct device *dev)
+ struct uart_port *port = s3c24xx_dev_to_port(dev);
+ struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+- if (port) {
+- clk_prepare_enable(ourport->clk);
+- s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
+- clk_disable_unprepare(ourport->clk);
++ clk_prepare_enable(ourport->clk);
++ s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
++ clk_disable_unprepare(ourport->clk);
+
+- uart_resume_port(&s3c24xx_uart_drv, port);
+- }
++ uart_resume_port(&s3c24xx_uart_drv, port);
+
+ return 0;
+ }
+@@ -1333,16 +1330,14 @@ static int s3c24xx_serial_resume_noirq(struct device *dev)
+ {
+ struct uart_port *port = s3c24xx_dev_to_port(dev);
+
+- if (port) {
+- /* restore IRQ mask */
+- if (s3c24xx_serial_has_interrupt_mask(port)) {
+- unsigned int uintm = 0xf;
+- if (tx_enabled(port))
+- uintm &= ~S3C64XX_UINTM_TXD_MSK;
+- if (rx_enabled(port))
+- uintm &= ~S3C64XX_UINTM_RXD_MSK;
+- wr_regl(port, S3C64XX_UINTM, uintm);
+- }
++ /* restore IRQ mask */
++ if (s3c24xx_serial_has_interrupt_mask(port)) {
++ unsigned int uintm = 0xf;
++ if (tx_enabled(port))
++ uintm &= ~S3C64XX_UINTM_TXD_MSK;
++ if (rx_enabled(port))
++ uintm &= ~S3C64XX_UINTM_RXD_MSK;
++ wr_regl(port, S3C64XX_UINTM, uintm);
+ }
+
+ return 0;
+--
+1.8.3.2
+