Commit 84f0e490 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Eduardo Valentin
Browse files

thermal: rcar_thermal: remove redundant operation 



Probe error operation and remove operation are same.
Let's use same function.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 28524988

drivers/thermal/rcar_thermal.c

+21 −28
Original line number Diff line number Diff line
@@ -361,6 +361,24 @@ static irqreturn_t rcar_thermal_irq(int irq, void *data) 
/*

 *		platform functions

 */

static int rcar_thermal_remove(struct platform_device *pdev)

{

	struct rcar_thermal_common *common = platform_get_drvdata(pdev);

	struct device *dev = &pdev->dev;

	struct rcar_thermal_priv *priv;



	rcar_thermal_for_each_priv(priv, common) {

		if (rcar_has_irq_support(priv))

			rcar_thermal_irq_disable(priv);

		thermal_zone_device_unregister(priv->zone);

	}



	pm_runtime_put(dev);

	pm_runtime_disable(dev);



	return 0;

}



static int rcar_thermal_probe(struct platform_device *pdev)

{

	struct rcar_thermal_common *common;
@@ -377,6 +395,8 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
	if (!common)

		return -ENOMEM;



	platform_set_drvdata(pdev, common);



	INIT_LIST_HEAD(&common->head);

	spin_lock_init(&common->lock);

	common->dev = dev;
@@ -454,43 +474,16 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
		rcar_thermal_common_write(common, ENR, enr_bits);

	}



	platform_set_drvdata(pdev, common);



	dev_info(dev, "%d sensor probed\n", i);



	return 0;



error_unregister:

	rcar_thermal_for_each_priv(priv, common) {

		if (rcar_has_irq_support(priv))

			rcar_thermal_irq_disable(priv);

		thermal_zone_device_unregister(priv->zone);

	}



	pm_runtime_put(dev);

	pm_runtime_disable(dev);

	rcar_thermal_remove(pdev);



	return ret;

}



static int rcar_thermal_remove(struct platform_device *pdev)

{

	struct rcar_thermal_common *common = platform_get_drvdata(pdev);

	struct device *dev = &pdev->dev;

	struct rcar_thermal_priv *priv;



	rcar_thermal_for_each_priv(priv, common) {

		if (rcar_has_irq_support(priv))

			rcar_thermal_irq_disable(priv);

		thermal_zone_device_unregister(priv->zone);

	}



	pm_runtime_put(dev);

	pm_runtime_disable(dev);



	return 0;

}



static const struct of_device_id rcar_thermal_dt_ids[] = {

	{ .compatible = "renesas,rcar-thermal", },

	{},