[PATCH 3/3] usb: phy: omap-control-usb: Convert to devm_ioremap_resource()

[Sachin Kamat]

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.ka...@linaro.org
Cc: Kishon Vijay Abraham I kis...@ti.com
---
 drivers/usb/phy/omap-control-usb.c |   24 +---
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/phy/omap-control-usb.c 
b/drivers/usb/phy/omap-control-usb.c
index 5323b71..1419ced 100644
--- a/drivers/usb/phy/omap-control-usb.c
+++ b/drivers/usb/phy/omap-control-usb.c
@@ -219,32 +219,26 @@ static int omap_control_usb_probe(struct platform_device 
*pdev)
 
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
control_dev_conf);
-   control_usb-dev_conf = devm_request_and_ioremap(pdev-dev, res);
-   if (!control_usb-dev_conf) {
-   dev_err(pdev-dev, Failed to obtain io memory\n);
-   return -EADDRNOTAVAIL;
-   }
+   control_usb-dev_conf = devm_ioremap_resource(pdev-dev, res);
+   if (IS_ERR(control_usb-dev_conf))
+   return PTR_ERR(control_usb-dev_conf);
 
if (control_usb-type == OMAP_CTRL_DEV_TYPE1) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
otghs_control);
-   control_usb-otghs_control = devm_request_and_ioremap(
+   control_usb-otghs_control = devm_ioremap_resource(
pdev-dev, res);
-   if (!control_usb-otghs_control) {
-   dev_err(pdev-dev, Failed to obtain io memory\n);
-   return -EADDRNOTAVAIL;
-   }
+   if (IS_ERR(control_usb-otghs_control))
+   return PTR_ERR(control_usb-otghs_control);
}
 
if (control_usb-type == OMAP_CTRL_DEV_TYPE2) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
phy_power_usb);
-   control_usb-phy_power = devm_request_and_ioremap(
+   control_usb-phy_power = devm_ioremap_resource(
pdev-dev, res);
-   if (!control_usb-phy_power) {
-   dev_dbg(pdev-dev, Failed to obtain io memory\n);
-   return -EADDRNOTAVAIL;
-   }
+   if (IS_ERR(control_usb-phy_power))
+   return PTR_ERR(control_usb-phy_power);
 
control_usb-sys_clk = devm_clk_get(control_usb-dev,
sys_clkin);
-- 
1.7.4.1

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/3] usb: phy: omap-control-usb: Convert to devm_ioremap_resource()

[Thierry Reding]

On Mon, Mar 04, 2013 at 02:05:43PM +0530, Sachin Kamat wrote:
 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.ka...@linaro.org
 Cc: Kishon Vijay Abraham I kis...@ti.com
 ---
  drivers/usb/phy/omap-control-usb.c |   24 +---
  1 files changed, 9 insertions(+), 15 deletions(-)

Reviewed-by: Thierry Reding thierry.red...@avionic-design.de


pgpY3qVaPsu4D.pgp
Description: PGP signature