diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-04-09 16:16:37 +0530 | 
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-09 15:01:31 +0200 | 
| commit | 651da3d4026ece555853694f51dbad566f113793 (patch) | |
| tree | 9a466e8a7eb7a67cc624fc715c569ea2579f059d | |
| parent | d011c450814eb6b5418c84dd0cac8b6eb99c42dc (diff) | |
| download | olio-linux-3.10-651da3d4026ece555853694f51dbad566f113793.tar.xz olio-linux-3.10-651da3d4026ece555853694f51dbad566f113793.zip  | |
mfd: omap-usb-tll: 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: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/omap-usb-tll.c | 9 | 
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c index 8f4d5a1fcd1..e59ac4cbac9 100644 --- a/drivers/mfd/omap-usb-tll.c +++ b/drivers/mfd/omap-usb-tll.c @@ -226,12 +226,9 @@ static int usbtll_omap_probe(struct platform_device *pdev)  	}  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -	tll->base = devm_request_and_ioremap(dev, res); -	if (!tll->base) { -		ret = -EADDRNOTAVAIL; -		dev_err(dev, "Resource request/ioremap failed:%d\n", ret); -		return ret; -	} +	tll->base = devm_ioremap_resource(dev, res); +	if (IS_ERR(tll->base)) +		return PTR_ERR(tll->base);  	platform_set_drvdata(pdev, tll);  	pm_runtime_enable(dev);  |