aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg/mxs-phy.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-21 05:09:22 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-22 14:41:58 -0500
commit148e11349b0c9c7199fd3096254bd3ea16d59a05 (patch)
tree48fa3e59a152ad95b4e545e1e623c3e442653d53 /drivers/usb/otg/mxs-phy.c
parenteb612fa013ca07b954300fa46b1499248cedf926 (diff)
usb: 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: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/otg/mxs-phy.c')
-rw-r--r--drivers/usb/otg/mxs-phy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/otg/mxs-phy.c b/drivers/usb/otg/mxs-phy.c
index 76302720055a..60df28a294b7 100644
--- a/drivers/usb/otg/mxs-phy.c
+++ b/drivers/usb/otg/mxs-phy.c
@@ -115,9 +115,9 @@ static int mxs_phy_probe(struct platform_device *pdev)
115 return -ENOENT; 115 return -ENOENT;
116 } 116 }
117 117
118 base = devm_request_and_ioremap(&pdev->dev, res); 118 base = devm_ioremap_resource(&pdev->dev, res);
119 if (!base) 119 if (IS_ERR(base))
120 return -EBUSY; 120 return PTR_ERR(base);
121 121
122 clk = devm_clk_get(&pdev->dev, NULL); 122 clk = devm_clk_get(&pdev->dev, NULL);
123 if (IS_ERR(clk)) { 123 if (IS_ERR(clk)) {