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

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

w1: 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>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc3bad16

drivers/w1/masters/omap_hdq.c

+3 −5
Original line number Diff line number Diff line
@@ -560,11 +560,9 @@ static int omap_hdq_probe(struct platform_device *pdev) 
		return -ENXIO;

	}



	hdq_data->hdq_base = devm_request_and_ioremap(dev, res);

	if (!hdq_data->hdq_base) {

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

		return -ENOMEM;

	}

	hdq_data->hdq_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(hdq_data->hdq_base))

		return PTR_ERR(hdq_data->hdq_base);



	hdq_data->hdq_usecount = 0;

	mutex_init(&hdq_data->hdq_mutex);