Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

"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.lin@ingics.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

authored by

Axel Lin and committed by
Kishon Vijay Abraham I
52ea796b 358d6c87

+3 -20
+3 -20
drivers/phy/phy-qcom-ufs.c
··· 135 135 int err = 0; 136 136 137 137 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy_mem"); 138 - if (!res) { 139 - dev_err(dev, "%s: phy_mem resource not found\n", __func__); 140 - err = -ENOMEM; 141 - goto out; 142 - } 143 - 144 138 phy_common->mmio = devm_ioremap_resource(dev, res); 145 139 if (IS_ERR((void const *)phy_common->mmio)) { 146 140 err = PTR_ERR((void const *)phy_common->mmio); 147 141 phy_common->mmio = NULL; 148 142 dev_err(dev, "%s: ioremap for phy_mem resource failed %d\n", 149 143 __func__, err); 150 - goto out; 144 + return err; 151 145 } 152 146 153 147 /* "dev_ref_clk_ctrl_mem" is optional resource */ 154 148 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, 155 149 "dev_ref_clk_ctrl_mem"); 156 - if (!res) { 157 - dev_dbg(dev, "%s: dev_ref_clk_ctrl_mem resource not found\n", 158 - __func__); 159 - goto out; 160 - } 161 - 162 150 phy_common->dev_ref_clk_ctrl_mmio = devm_ioremap_resource(dev, res); 163 - if (IS_ERR((void const *)phy_common->dev_ref_clk_ctrl_mmio)) { 164 - err = PTR_ERR((void const *)phy_common->dev_ref_clk_ctrl_mmio); 151 + if (IS_ERR((void const *)phy_common->dev_ref_clk_ctrl_mmio)) 165 152 phy_common->dev_ref_clk_ctrl_mmio = NULL; 166 - dev_err(dev, "%s: ioremap for dev_ref_clk_ctrl_mem resource failed %d\n", 167 - __func__, err); 168 - } 169 153 170 - out: 171 - return err; 154 + return 0; 172 155 } 173 156 174 157 static int __ufs_qcom_phy_clk_get(struct phy *phy,