[PATCH V2 7/8] tty: serial: qcom_geni_serial: Unconditionally call dev_pm_opp_of_remove_table()

[Viresh Kumar]

dev_pm_opp_of_remove_table() doesn't report any errors when it fails to
find the OPP table with error -ENODEV (i.e. OPP table not present for
the device). And we can call dev_pm_opp_of_remove_table()
unconditionally here.

While at it, create a new label to put clkname on errors.

Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org>

---
V2:
- Compare with -ENODEV only for failures.
- Create new label to put clkname.
---
 drivers/tty/serial/qcom_geni_serial.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/tty/serial/qcom_geni_serial.c 
b/drivers/tty/serial/qcom_geni_serial.c
index 3aa29d201f54..33f1af6c61d1 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -1433,11 +1433,9 @@ static int qcom_geni_serial_probe(struct platform_device 
*pdev)
                return PTR_ERR(port->se.opp_table);
        /* OPP table is optional */
        ret = dev_pm_opp_of_add_table(&pdev->dev);
-       if (!ret) {
-               port->se.has_opp_table = true;
-       } else if (ret != -ENODEV) {
+       if (ret && ret != -ENODEV) {
                dev_err(&pdev->dev, "invalid OPP table in device tree\n");
-               return ret;
+               goto put_clkname;
        }
 
        port->private_data.drv = drv;
@@ -1478,8 +1476,8 @@ static int qcom_geni_serial_probe(struct platform_device 
*pdev)
 
        return 0;
 err:
-       if (port->se.has_opp_table)
-               dev_pm_opp_of_remove_table(&pdev->dev);
+       dev_pm_opp_of_remove_table(&pdev->dev);
+put_clkname:
        dev_pm_opp_put_clkname(port->se.opp_table);
        return ret;
 }
@@ -1489,8 +1487,7 @@ 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;
 
-       if (port->se.has_opp_table)
-               dev_pm_opp_of_remove_table(&pdev->dev);
+       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);
-- 
2.25.0.rc1.19.g042ed3e048af