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

Commit 4c271bb6 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

watchdog: Convert to devm_ioremap_resource() 



Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() 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 avatarThierry Reding <thierry.reding@avionic-design.de>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca36b1ba

drivers/watchdog/ar7_wdt.c

+3 −5
Original line number Diff line number Diff line
@@ -285,11 +285,9 @@ static int ar7_wdt_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	ar7_wdt = devm_request_and_ioremap(&pdev->dev, ar7_regs_wdt);

	if (!ar7_wdt) {

		pr_err("could not ioremap registers\n");

		return -ENXIO;

	}

	ar7_wdt = devm_ioremap_resource(&pdev->dev, ar7_regs_wdt);

	if (IS_ERR(ar7_wdt))

		return PTR_ERR(ar7_wdt);



	vbus_clk = clk_get(NULL, "vbus");

	if (IS_ERR(vbus_clk)) {

drivers/watchdog/dw_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -301,9 +301,9 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) 
	if (!mem)

		return -EINVAL;



	dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);

	if (!dw_wdt.regs)

		return -ENOMEM;

	dw_wdt.regs = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(dw_wdt.regs))

		return PTR_ERR(dw_wdt.regs);



	dw_wdt.clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(dw_wdt.clk))

drivers/watchdog/imx2_wdt.c

+3 −5
Original line number Diff line number Diff line
@@ -262,11 +262,9 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);

	if (!imx2_wdt.base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		return -ENOMEM;

	}

	imx2_wdt.base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(imx2_wdt.base))

		return PTR_ERR(imx2_wdt.base);



	imx2_wdt.clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(imx2_wdt.clk)) {

drivers/watchdog/jz4740_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -171,9 +171,9 @@ static int jz4740_wdt_probe(struct platform_device *pdev) 
	watchdog_set_drvdata(jz4740_wdt, drvdata);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	drvdata->base = devm_request_and_ioremap(&pdev->dev, res);

	if (drvdata->base == NULL) {

		ret = -EBUSY;

	drvdata->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(drvdata->base)) {

		ret = PTR_ERR(drvdata->base);

		goto err_out;

	}

drivers/watchdog/lantiq_wdt.c

+3 −5
Original line number Diff line number Diff line
@@ -197,11 +197,9 @@ ltq_wdt_probe(struct platform_device *pdev) 
		return -ENOENT;

	}



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

	if (!ltq_wdt_membase) {

		dev_err(&pdev->dev, "cannot remap I/O memory region\n");

		return -ENOMEM;

	}

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

	if (IS_ERR(ltq_wdt_membase))

		return PTR_ERR(ltq_wdt_membase);



	/* we do not need to enable the clock as it is always running */

	clk = clk_get_io();