Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bc51b66 authored by Sachin Kamat's avatar Sachin Kamat Committed by Zhang Rui
Browse files

Thermal: dove: Convert to devm_ioremap_resource() 



Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages; so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent f0e68fc3

drivers/thermal/dove_thermal.c

+6 −10
Original line number Diff line number Diff line
@@ -143,22 +143,18 @@ static int dove_thermal_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	priv->sensor = devm_request_and_ioremap(&pdev->dev, res);

	if (!priv->sensor) {

		dev_err(&pdev->dev, "Failed to request_ioremap memory\n");

		return -EADDRNOTAVAIL;

	}

	priv->sensor = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->sensor))

		return PTR_ERR(priv->sensor);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	if (!res) {

		dev_err(&pdev->dev, "Failed to get platform resource\n");

		return -ENODEV;

	}

	priv->control = devm_request_and_ioremap(&pdev->dev, res);

	if (!priv->control) {

		dev_err(&pdev->dev, "Failed to request_ioremap memory\n");

		return -EADDRNOTAVAIL;

	}

	priv->control = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->control))

		return PTR_ERR(priv->control);



	ret = dove_init_sensor(priv);

	if (ret) {