Merge tag 'pm-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-2.6-microblaze.git] / drivers / tty / serial / qcom_geni_serial.c

diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 00bb88a..23d729e 100644 (file)
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -1426,14 +1426,14 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
        if (of_property_read_bool(pdev->dev.of_node, "cts-rts-swap"))
                port->cts_rts_swap = true;
 
-       port->se.opp_table = dev_pm_opp_set_clkname(&pdev->dev, "se");
-       if (IS_ERR(port->se.opp_table))
-               return PTR_ERR(port->se.opp_table);
+       ret = devm_pm_opp_set_clkname(&pdev->dev, "se");
+       if (ret)
+               return ret;
        /* OPP table is optional */
-       ret = dev_pm_opp_of_add_table(&pdev->dev);
+       ret = devm_pm_opp_of_add_table(&pdev->dev);
        if (ret && ret != -ENODEV) {
                dev_err(&pdev->dev, "invalid OPP table in device tree\n");
-               goto put_clkname;
+               return ret;
        }
 
        port->private_data.drv = drv;
@@ -1443,7 +1443,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
 
        ret = uart_add_one_port(drv, uport);
        if (ret)
-               goto err;
+               return ret;
 
        irq_set_status_flags(uport->irq, IRQ_NOAUTOEN);
        ret = devm_request_irq(uport->dev, uport->irq, qcom_geni_serial_isr,
@@ -1451,7 +1451,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(uport->dev, "Failed to get IRQ ret %d\n", ret);
                uart_remove_one_port(drv, uport);
-               goto err;
+               return ret;
        }
 
        /*
@@ -1468,16 +1468,11 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
                if (ret) {
                        device_init_wakeup(&pdev->dev, false);
                        uart_remove_one_port(drv, uport);
-                       goto err;
+                       return ret;
                }
        }
 
        return 0;
-err:
-       dev_pm_opp_of_remove_table(&pdev->dev);
-put_clkname:
-       dev_pm_opp_put_clkname(port->se.opp_table);
-       return ret;
 }
 
 static int qcom_geni_serial_remove(struct platform_device *pdev)
@@ -1485,8 +1480,6 @@ static int qcom_geni_serial_remove(struct platform_device *pdev)
        struct qcom_geni_serial_port *port = platform_get_drvdata(pdev);
        struct uart_driver *drv = port->private_data.drv;
 
-       dev_pm_opp_of_remove_table(&pdev->dev);
-       dev_pm_opp_put_clkname(port->se.opp_table);
        dev_pm_clear_wake_irq(&pdev->dev);
        device_init_wakeup(&pdev->dev, false);
        uart_remove_one_port(drv, &port->uport);