14 files changed, 3 insertions, 31 deletions

diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
index 27f20c57abed..9824dfb1e4fe 100644
--- a/drivers/tty/serial/ar933x_uart.c
+++ b/drivers/tty/serial/ar933x_uart.c
@@ -703,7 +703,6 @@ static int ar933x_uart_remove(struct platform_device *pdev)
         struct ar933x_uart_port *up;
 
         up = platform_get_drvdata(pdev);
-        platform_set_drvdata(pdev, NULL);
 
         if (up) {
                 uart_remove_one_port(&ar933x_uart_driver, &up->port);
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 0e39facfcb07..5c17f8dac91b 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1860,7 +1860,6 @@ static int atmel_serial_remove(struct platform_device *pdev)
         int ret = 0;
 
         device_init_wakeup(&pdev->dev, 0);
-        platform_set_drvdata(pdev, NULL);
 
         ret = uart_remove_one_port(&atmel_uart, port);
 
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index 6fa2ae77fffd..d14ba5aa2ec7 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -852,7 +852,6 @@ static int bcm_uart_remove(struct platform_device *pdev)
 
         port = platform_get_drvdata(pdev);
         uart_remove_one_port(&bcm_uart_driver, port);
-        platform_set_drvdata(pdev, NULL);
         /* mark port as free */
         ports[pdev->id].membase = 0;
         return 0;
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index bfb17968c8db..7e4e4088471c 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -438,8 +438,7 @@ static int uart_clps711x_probe(struct platform_device *pdev)
         s->uart_clk = devm_clk_get(&pdev->dev, "uart");
         if (IS_ERR(s->uart_clk)) {
                 dev_err(&pdev->dev, "Can't get UART clocks\n");
-                ret = PTR_ERR(s->uart_clk);
-                goto err_out;
+                return PTR_ERR(s->uart_clk);
         }
 
         s->uart.owner           = THIS_MODULE;
@@ -461,7 +460,7 @@ static int uart_clps711x_probe(struct platform_device *pdev)
         if (ret) {
                 dev_err(&pdev->dev, "Registering UART driver failed\n");
                 devm_clk_put(&pdev->dev, s->uart_clk);
-                goto err_out;
+                return ret;
         }
 
         for (i = 0; i < UART_CLPS711X_NR; i++) {
@@ -478,11 +477,6 @@ static int uart_clps711x_probe(struct platform_device *pdev)
         }
 
         return 0;
-
-err_out:
-        platform_set_drvdata(pdev, NULL);
-
-        return ret;
 }
 
 static int uart_clps711x_remove(struct platform_device *pdev)
@@ -495,7 +489,6 @@ static int uart_clps711x_remove(struct platform_device *pdev)
 
         devm_clk_put(&pdev->dev, s->uart_clk);
         uart_unregister_driver(&s->uart);
-        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index 7d199c8e1a75..e029907cf430 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -778,8 +778,6 @@ static int efm32_uart_remove(struct platform_device *pdev)
 {
         struct efm32_uart_port *efm_port = platform_get_drvdata(pdev);
 
-        platform_set_drvdata(pdev, NULL);
-
         uart_remove_one_port(&efm32_uart_reg, &efm_port->port);
 
         if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(efm32_uart_ports))
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 2797e55d9753..40ca759d1f17 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1596,8 +1596,6 @@ static int serial_imx_remove(struct platform_device *pdev)
 
         pdata = pdev->dev.platform_data;
 
-        platform_set_drvdata(pdev, NULL);
-
         uart_remove_one_port(&imx_reg, &sport->port);
 
         if (pdata && pdata->exit)
diff --git a/drivers/tty/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c
index b9a40ed70be2..ce04f3f8c547 100644
--- a/drivers/tty/serial/netx-serial.c
+++ b/drivers/tty/serial/netx-serial.c
@@ -693,8 +693,6 @@ static int serial_netx_remove(struct platform_device *pdev)
 {
         struct netx_port *sport = platform_get_drvdata(pdev);
 
-        platform_set_drvdata(pdev, NULL);
-
         if (sport)
                 uart_remove_one_port(&netx_reg, &sport->port);
 
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index b1785f58b6e3..f87f1a0c8c6e 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1798,7 +1798,6 @@ static int __exit pmz_detach(struct platform_device *pdev)
 
         uart_remove_one_port(&pmz_uart_reg, &uap->port);
 
-        platform_set_drvdata(pdev, NULL);
         uap->port.dev = NULL;
 
         return 0;
diff --git a/drivers/tty/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c
index 7e277a5384a7..b6b7aca5707a 100644
--- a/drivers/tty/serial/pnx8xxx_uart.c
+++ b/drivers/tty/serial/pnx8xxx_uart.c
@@ -801,8 +801,6 @@ static int pnx8xxx_serial_remove(struct platform_device *pdev)
 {
         struct pnx8xxx_port *sport = platform_get_drvdata(pdev);
 
-        platform_set_drvdata(pdev, NULL);
-
         if (sport)
                 uart_remove_one_port(&pnx8xxx_reg, &sport->port);
 
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 05f504e0c271..ac8b2f5b2396 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -945,8 +945,6 @@ static int serial_pxa_remove(struct platform_device *dev)
 {
         struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
-        platform_set_drvdata(dev, NULL);
-
         uart_remove_one_port(&serial_pxa_reg, &sport->port);
 
         clk_unprepare(sport->clk);
diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index af6b3e3ad24d..fc23ea19073a 100644
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -864,8 +864,6 @@ static int sa1100_serial_remove(struct platform_device *pdev)
 {
         struct sa1100_port *sport = platform_get_drvdata(pdev);
 
-        platform_set_drvdata(pdev, NULL);
-
         if (sport)
                 uart_remove_one_port(&sa1100_reg, &sport->port);
 
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index c77304155410..98555179fe10 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -997,8 +997,6 @@ static int sccnxp_probe(struct platform_device *pdev)
         }
 
 err_out:
-        platform_set_drvdata(pdev, NULL);
-
         return ret;
 }
 
@@ -1016,7 +1014,6 @@ static int sccnxp_remove(struct platform_device *pdev)
                 uart_remove_one_port(&s->uart, &s->port[i]);
 
         uart_unregister_driver(&s->uart);
-        platform_set_drvdata(pdev, NULL);
 
         if (!IS_ERR(s->regulator))
                 return regulator_disable(s->regulator);
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 1fd564b8194b..67a0d1b8341c 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -717,7 +717,6 @@ port_err:
         clk_disable_unprepare(sirfport->clk);
         clk_put(sirfport->clk);
 clk_err:
-        platform_set_drvdata(pdev, NULL);
         if (sirfport->hw_flow_ctrl)
                 pinctrl_put(sirfport->p);
 err:
@@ -728,7 +727,7 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
 {
         struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
         struct uart_port *port = &sirfport->port;
-        platform_set_drvdata(pdev, NULL);
+
         if (sirfport->hw_flow_ctrl)
                 pinctrl_put(sirfport->p);
         clk_disable_unprepare(sirfport->clk);
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 48af43de3467..a90bf0440b4f 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -630,7 +630,6 @@ static int vt8500_serial_remove(struct platform_device *pdev)
 {
         struct vt8500_port *vt8500_port = platform_get_drvdata(pdev);
 
-        platform_set_drvdata(pdev, NULL);
         clk_disable_unprepare(vt8500_port->clk);
         uart_remove_one_port(&vt8500_uart_driver, &vt8500_port->uart);