Commit 9bb4ec8d authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Eduardo Valentin
Browse files

thermal/drivers/hisi: Factor out the probe functions 



The hi6220 and the hi3660 probe functions are doing almost the same
operations, they can share 90% of their code.

Factor out the probe functions by moving the common code in the common
probe function.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 49e778d1

drivers/thermal/hisi_thermal.c

+12 −27
Original line number Diff line number Diff line
@@ -391,16 +391,8 @@ static int hi6220_thermal_probe(struct hisi_thermal_data *data) 
{

	struct platform_device *pdev = data->pdev;

	struct device *dev = &pdev->dev;

	struct resource *res;

	int ret;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	data->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(data->regs)) {

		dev_err(dev, "failed to get io address\n");

		return PTR_ERR(data->regs);

	}



	data->clk = devm_clk_get(dev, "thermal_clk");

	if (IS_ERR(data->clk)) {

		ret = PTR_ERR(data->clk);
@@ -409,10 +401,6 @@ static int hi6220_thermal_probe(struct hisi_thermal_data *data) 
		return ret;

	}



	data->irq = platform_get_irq(pdev, 0);

	if (data->irq < 0)

		return data->irq;



	data->sensor.id = HI6220_DEFAULT_SENSOR;



	return 0;
@@ -420,21 +408,6 @@ static int hi6220_thermal_probe(struct hisi_thermal_data *data) 


static int hi3660_thermal_probe(struct hisi_thermal_data *data)

{

	struct platform_device *pdev = data->pdev;

	struct device *dev = &pdev->dev;

	struct resource *res;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	data->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(data->regs)) {

		dev_err(dev, "failed to get io address\n");

		return PTR_ERR(data->regs);

	}



	data->irq = platform_get_irq(pdev, 0);

	if (data->irq < 0)

		return data->irq;



	data->sensor.id = HI3660_DEFAULT_SENSOR;



	return 0;
@@ -553,6 +526,7 @@ static int hisi_thermal_probe(struct platform_device *pdev) 
{

	struct hisi_thermal_data *data;

	struct device *dev = &pdev->dev;

	struct resource *res;

	int ret;



	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
@@ -564,6 +538,17 @@ static int hisi_thermal_probe(struct platform_device *pdev) 
	data->sensor.data = data;

	data->ops = of_device_get_match_data(dev);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	data->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(data->regs)) {

		dev_err(dev, "failed to get io address\n");

		return PTR_ERR(data->regs);

	}



	data->irq = platform_get_irq(pdev, 0);

	if (data->irq < 0)

		return data->irq;



	ret = data->ops->probe(data);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE