Commit 300894a6 authored by Yangtao Li's avatar Yangtao Li Committed by Viresh Kumar
Browse files

serial: qcom_geni_serial: Convert to use resource-managed OPP API 



Use resource-managed OPP API to simplify code.

Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 9edf48a4

drivers/tty/serial/qcom_geni_serial.c

+8 −15
Original line number Diff line number Diff line
@@ -1433,14 +1433,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;
@@ -1450,7 +1450,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,
@@ -1458,7 +1458,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;

	}



	/*
@@ -1475,16 +1475,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)
@@ -1492,8 +1487,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);