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

phy: broadcom: convert to devm_platform_ioremap_resource(_byname)

Use devm_platform_ioremap_resource(_byname) to simplify code

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Cc: Al Cooper <alcooperx@gmail.com>
Link: https://lore.kernel.org/r/1604642930-29019-3-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Chunfeng Yun and committed by
Vinod Koul
f669bc8b 202de025

+13 -36
+1 -3
drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
··· 126 126 struct device_node *node = dev->of_node, *child; 127 127 struct cygnus_pcie_phy_core *core; 128 128 struct phy_provider *provider; 129 - struct resource *res; 130 129 unsigned cnt = 0; 131 130 int ret; 132 131 ··· 140 141 141 142 core->dev = dev; 142 143 143 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 144 - core->base = devm_ioremap_resource(dev, res); 144 + core->base = devm_platform_ioremap_resource(pdev, 0); 145 145 if (IS_ERR(core->base)) 146 146 return PTR_ERR(core->base); 147 147
+1 -3
drivers/phy/broadcom/phy-bcm-kona-usb2.c
··· 94 94 { 95 95 struct device *dev = &pdev->dev; 96 96 struct bcm_kona_usb *phy; 97 - struct resource *res; 98 97 struct phy *gphy; 99 98 struct phy_provider *phy_provider; 100 99 ··· 101 102 if (!phy) 102 103 return -ENOMEM; 103 104 104 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 105 - phy->regs = devm_ioremap_resource(&pdev->dev, res); 105 + phy->regs = devm_platform_ioremap_resource(pdev, 0); 106 106 if (IS_ERR(phy->regs)) 107 107 return PTR_ERR(phy->regs); 108 108
+1 -3
drivers/phy/broadcom/phy-bcm-ns-usb2.c
··· 83 83 { 84 84 struct device *dev = &pdev->dev; 85 85 struct bcm_ns_usb2 *usb2; 86 - struct resource *res; 87 86 struct phy_provider *phy_provider; 88 87 89 88 usb2 = devm_kzalloc(&pdev->dev, sizeof(*usb2), GFP_KERNEL); ··· 90 91 return -ENOMEM; 91 92 usb2->dev = dev; 92 93 93 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmu"); 94 - usb2->dmu = devm_ioremap_resource(dev, res); 94 + usb2->dmu = devm_platform_ioremap_resource_byname(pdev, "dmu"); 95 95 if (IS_ERR(usb2->dmu)) { 96 96 dev_err(dev, "Failed to map DMU regs\n"); 97 97 return PTR_ERR(usb2->dmu);
+2 -5
drivers/phy/broadcom/phy-bcm-ns-usb3.c
··· 305 305 struct device *dev = &pdev->dev; 306 306 const struct of_device_id *of_id; 307 307 struct bcm_ns_usb3 *usb3; 308 - struct resource *res; 309 308 struct phy_provider *phy_provider; 310 309 311 310 usb3 = devm_kzalloc(dev, sizeof(*usb3), GFP_KERNEL); ··· 318 319 return -EINVAL; 319 320 usb3->family = (enum bcm_ns_family)of_id->data; 320 321 321 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmp"); 322 - usb3->dmp = devm_ioremap_resource(dev, res); 322 + usb3->dmp = devm_platform_ioremap_resource_byname(pdev, "dmp"); 323 323 if (IS_ERR(usb3->dmp)) { 324 324 dev_err(dev, "Failed to map DMP regs\n"); 325 325 return PTR_ERR(usb3->dmp); 326 326 } 327 327 328 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ccb-mii"); 329 - usb3->ccb_mii = devm_ioremap_resource(dev, res); 328 + usb3->ccb_mii = devm_platform_ioremap_resource_byname(pdev, "ccb-mii"); 330 329 if (IS_ERR(usb3->ccb_mii)) { 331 330 dev_err(dev, "Failed to map ChipCommon B MII regs\n"); 332 331 return PTR_ERR(usb3->ccb_mii);
+4 -9
drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
··· 293 293 struct device *dev = &pdev->dev; 294 294 struct ns2_phy_driver *driver; 295 295 struct ns2_phy_data *data; 296 - struct resource *res; 297 296 int ret; 298 297 u32 val; 299 298 ··· 306 307 if (!driver->data) 307 308 return -ENOMEM; 308 309 309 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "icfg"); 310 - driver->icfgdrd_regs = devm_ioremap_resource(dev, res); 310 + driver->icfgdrd_regs = devm_platform_ioremap_resource_byname(pdev, "icfg"); 311 311 if (IS_ERR(driver->icfgdrd_regs)) 312 312 return PTR_ERR(driver->icfgdrd_regs); 313 313 314 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rst-ctrl"); 315 - driver->idmdrd_rst_ctrl = devm_ioremap_resource(dev, res); 314 + driver->idmdrd_rst_ctrl = devm_platform_ioremap_resource_byname(pdev, "rst-ctrl"); 316 315 if (IS_ERR(driver->idmdrd_rst_ctrl)) 317 316 return PTR_ERR(driver->idmdrd_rst_ctrl); 318 317 319 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "crmu-ctrl"); 320 - driver->crmu_usb2_ctrl = devm_ioremap_resource(dev, res); 318 + driver->crmu_usb2_ctrl = devm_platform_ioremap_resource_byname(pdev, "crmu-ctrl"); 321 319 if (IS_ERR(driver->crmu_usb2_ctrl)) 322 320 return PTR_ERR(driver->crmu_usb2_ctrl); 323 321 324 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "usb2-strap"); 325 - driver->usb2h_strap_reg = devm_ioremap_resource(dev, res); 322 + driver->usb2h_strap_reg = devm_platform_ioremap_resource_byname(pdev, "usb2-strap"); 326 323 if (IS_ERR(driver->usb2h_strap_reg)) 327 324 return PTR_ERR(driver->usb2h_strap_reg); 328 325
+1 -4
drivers/phy/broadcom/phy-bcm-sr-pcie.c
··· 217 217 struct device *dev = &pdev->dev; 218 218 struct device_node *node = dev->of_node; 219 219 struct sr_pcie_phy_core *core; 220 - struct resource *res; 221 220 struct phy_provider *provider; 222 221 unsigned int phy_idx = 0; 223 222 ··· 225 226 return -ENOMEM; 226 227 227 228 core->dev = dev; 228 - 229 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 230 - core->base = devm_ioremap_resource(core->dev, res); 229 + core->base = devm_platform_ioremap_resource(pdev, 0); 231 230 if (IS_ERR(core->base)) 232 231 return PTR_ERR(core->base); 233 232
+1 -3
drivers/phy/broadcom/phy-bcm-sr-usb.c
··· 300 300 struct device *dev = &pdev->dev; 301 301 struct device_node *dn = dev->of_node; 302 302 const struct of_device_id *of_id; 303 - struct resource *res; 304 303 void __iomem *regs; 305 304 int ret; 306 305 enum bcm_usb_phy_version version; 307 306 struct phy_provider *phy_provider; 308 307 309 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 310 - regs = devm_ioremap_resource(dev, res); 308 + regs = devm_platform_ioremap_resource(pdev, 0); 311 309 if (IS_ERR(regs)) 312 310 return PTR_ERR(regs); 313 311
+2 -6
drivers/phy/broadcom/phy-brcm-sata.c
··· 726 726 struct device_node *dn = dev->of_node, *child; 727 727 const struct of_device_id *of_id; 728 728 struct brcm_sata_phy *priv; 729 - struct resource *res; 730 729 struct phy_provider *provider; 731 730 int ret, count = 0; 732 731 ··· 738 739 dev_set_drvdata(dev, priv); 739 740 priv->dev = dev; 740 741 741 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy"); 742 - priv->phy_base = devm_ioremap_resource(dev, res); 742 + priv->phy_base = devm_platform_ioremap_resource_byname(pdev, "phy"); 743 743 if (IS_ERR(priv->phy_base)) 744 744 return PTR_ERR(priv->phy_base); 745 745 ··· 749 751 priv->version = BRCM_SATA_PHY_STB_28NM; 750 752 751 753 if (priv->version == BRCM_SATA_PHY_IPROC_NS2) { 752 - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, 753 - "phy-ctrl"); 754 - priv->ctrl_base = devm_ioremap_resource(dev, res); 754 + priv->ctrl_base = devm_platform_ioremap_resource_byname(pdev, "phy-ctrl"); 755 755 if (IS_ERR(priv->ctrl_base)) 756 756 return PTR_ERR(priv->ctrl_base); 757 757 }