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

Commit 5095526f authored by Sachin Kamat's avatar Sachin Kamat Committed by Zhang Rui
Browse files

Thermal: rcar: 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 6bc51b66

drivers/thermal/rcar_thermal.c

+6 −10
Original line number Diff line number Diff line
@@ -400,11 +400,9 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
		/*

		 * rcar_has_irq_support() will be enabled

		 */

		common->base = devm_request_and_ioremap(dev, res);

		if (!common->base) {

			dev_err(dev, "Unable to ioremap thermal register\n");

			return -ENOMEM;

		}

		common->base = devm_ioremap_resource(dev, res);

		if (IS_ERR(common->base))

			return PTR_ERR(common->base);



		/* enable temperature comparation */

		rcar_thermal_common_write(common, ENR, 0x00030303);
@@ -423,11 +421,9 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
			return -ENOMEM;

		}



		priv->base = devm_request_and_ioremap(dev, res);

		if (!priv->base) {

			dev_err(dev, "Unable to ioremap priv register\n");

			return -ENOMEM;

		}

		priv->base = devm_ioremap_resource(dev, res);

		if (IS_ERR(priv->base))

			return PTR_ERR(priv->base);



		priv->common = common;

		priv->id = i;