[PATCH] phy: qcom-ufs: Don't return error if fail to get optional resource

2015-03-22 Thread Axel Lin
"dev_ref_clk_ctrl_mem" is optional resource, so don't return error if fail to
get the resource. Since it's an optional resource, don't emit error if
fail to get dev_ref_clk_ctrl_mem.

Also remove redundant test for res, it's done by devm_ioremap_resource().

Signed-off-by: Axel Lin 
---
 drivers/phy/phy-qcom-ufs.c | 23 +++
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
index 7f0ad81..73799f8 100644
--- a/drivers/phy/phy-qcom-ufs.c
+++ b/drivers/phy/phy-qcom-ufs.c
@@ -134,40 +134,23 @@ int ufs_qcom_phy_base_init(struct platform_device *pdev,
int err = 0;
 
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy_mem");
-   if (!res) {
-   dev_err(dev, "%s: phy_mem resource not found\n", __func__);
-   err = -ENOMEM;
-   goto out;
-   }
-
phy_common->mmio = devm_ioremap_resource(dev, res);
if (IS_ERR((void const *)phy_common->mmio)) {
err = PTR_ERR((void const *)phy_common->mmio);
phy_common->mmio = NULL;
dev_err(dev, "%s: ioremap for phy_mem resource failed %d\n",
__func__, err);
-   goto out;
+   return err;
}
 
/* "dev_ref_clk_ctrl_mem" is optional resource */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
   "dev_ref_clk_ctrl_mem");
-   if (!res) {
-   dev_dbg(dev, "%s: dev_ref_clk_ctrl_mem resource not found\n",
-   __func__);
-   goto out;
-   }
-
phy_common->dev_ref_clk_ctrl_mmio = devm_ioremap_resource(dev, res);
-   if (IS_ERR((void const *)phy_common->dev_ref_clk_ctrl_mmio)) {
-   err = PTR_ERR((void const *)phy_common->dev_ref_clk_ctrl_mmio);
+   if (IS_ERR((void const *)phy_common->dev_ref_clk_ctrl_mmio))
phy_common->dev_ref_clk_ctrl_mmio = NULL;
-   dev_err(dev, "%s: ioremap for dev_ref_clk_ctrl_mem resource 
failed %d\n",
-   __func__, err);
-   }
 
-out:
-   return err;
+   return 0;
 }
 
 static int __ufs_qcom_phy_clk_get(struct phy *phy,
-- 
1.9.1



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] phy: qcom-ufs: Don't return error if fail to get optional resource

2015-03-22 Thread Axel Lin
dev_ref_clk_ctrl_mem is optional resource, so don't return error if fail to
get the resource. Since it's an optional resource, don't emit error if
fail to get dev_ref_clk_ctrl_mem.

Also remove redundant test for res, it's done by devm_ioremap_resource().

Signed-off-by: Axel Lin axel@ingics.com
---
 drivers/phy/phy-qcom-ufs.c | 23 +++
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
index 7f0ad81..73799f8 100644
--- a/drivers/phy/phy-qcom-ufs.c
+++ b/drivers/phy/phy-qcom-ufs.c
@@ -134,40 +134,23 @@ int ufs_qcom_phy_base_init(struct platform_device *pdev,
int err = 0;
 
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, phy_mem);
-   if (!res) {
-   dev_err(dev, %s: phy_mem resource not found\n, __func__);
-   err = -ENOMEM;
-   goto out;
-   }
-
phy_common-mmio = devm_ioremap_resource(dev, res);
if (IS_ERR((void const *)phy_common-mmio)) {
err = PTR_ERR((void const *)phy_common-mmio);
phy_common-mmio = NULL;
dev_err(dev, %s: ioremap for phy_mem resource failed %d\n,
__func__, err);
-   goto out;
+   return err;
}
 
/* dev_ref_clk_ctrl_mem is optional resource */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
   dev_ref_clk_ctrl_mem);
-   if (!res) {
-   dev_dbg(dev, %s: dev_ref_clk_ctrl_mem resource not found\n,
-   __func__);
-   goto out;
-   }
-
phy_common-dev_ref_clk_ctrl_mmio = devm_ioremap_resource(dev, res);
-   if (IS_ERR((void const *)phy_common-dev_ref_clk_ctrl_mmio)) {
-   err = PTR_ERR((void const *)phy_common-dev_ref_clk_ctrl_mmio);
+   if (IS_ERR((void const *)phy_common-dev_ref_clk_ctrl_mmio))
phy_common-dev_ref_clk_ctrl_mmio = NULL;
-   dev_err(dev, %s: ioremap for dev_ref_clk_ctrl_mem resource 
failed %d\n,
-   __func__, err);
-   }
 
-out:
-   return err;
+   return 0;
 }
 
 static int __ufs_qcom_phy_clk_get(struct phy *phy,
-- 
1.9.1



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