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

phy: marvell: convert to devm_platform_ioremap_resource

Use devm_platform_ioremap_resource to simplify code

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Link: https://lore.kernel.org/r/1604642930-29019-7-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Chunfeng Yun and committed by
Vinod Koul ee55b501 6c9111bc

+7 -21
+1 -3
drivers/phy/marvell/phy-armada375-usb2.c
··· 105 105 struct phy *phy; 106 106 struct phy_provider *phy_provider; 107 107 void __iomem *usb_cluster_base; 108 - struct resource *res; 109 108 struct armada375_cluster_phy *cluster_phy; 110 109 111 110 cluster_phy = devm_kzalloc(dev, sizeof(*cluster_phy), GFP_KERNEL); 112 111 if (!cluster_phy) 113 112 return -ENOMEM; 114 113 115 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 116 - usb_cluster_base = devm_ioremap_resource(&pdev->dev, res); 114 + usb_cluster_base = devm_platform_ioremap_resource(pdev, 0); 117 115 if (IS_ERR(usb_cluster_base)) 118 116 return PTR_ERR(usb_cluster_base); 119 117
+1 -3
drivers/phy/marvell/phy-berlin-usb.c
··· 165 165 const struct of_device_id *match = 166 166 of_match_device(phy_berlin_usb_of_match, &pdev->dev); 167 167 struct phy_berlin_usb_priv *priv; 168 - struct resource *res; 169 168 struct phy *phy; 170 169 struct phy_provider *phy_provider; 171 170 ··· 172 173 if (!priv) 173 174 return -ENOMEM; 174 175 175 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 176 - priv->base = devm_ioremap_resource(&pdev->dev, res); 176 + priv->base = devm_platform_ioremap_resource(pdev, 0); 177 177 if (IS_ERR(priv->base)) 178 178 return PTR_ERR(priv->base); 179 179
+1 -3
drivers/phy/marvell/phy-mmp3-usb.c
··· 246 246 static int mmp3_usb_phy_probe(struct platform_device *pdev) 247 247 { 248 248 struct device *dev = &pdev->dev; 249 - struct resource *resource; 250 249 struct mmp3_usb_phy *mmp3_usb_phy; 251 250 struct phy_provider *provider; 252 251 ··· 253 254 if (!mmp3_usb_phy) 254 255 return -ENOMEM; 255 256 256 - resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); 257 - mmp3_usb_phy->base = devm_ioremap_resource(dev, resource); 257 + mmp3_usb_phy->base = devm_platform_ioremap_resource(pdev, 0); 258 258 if (IS_ERR(mmp3_usb_phy->base)) { 259 259 dev_err(dev, "failed to remap PHY regs\n"); 260 260 return PTR_ERR(mmp3_usb_phy->base);
+1 -3
drivers/phy/marvell/phy-mvebu-sata.c
··· 80 80 static int phy_mvebu_sata_probe(struct platform_device *pdev) 81 81 { 82 82 struct phy_provider *phy_provider; 83 - struct resource *res; 84 83 struct priv *priv; 85 84 struct phy *phy; 86 85 ··· 87 88 if (!priv) 88 89 return -ENOMEM; 89 90 90 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 91 - priv->base = devm_ioremap_resource(&pdev->dev, res); 91 + priv->base = devm_platform_ioremap_resource(pdev, 0); 92 92 if (IS_ERR(priv->base)) 93 93 return PTR_ERR(priv->base); 94 94
+1 -3
drivers/phy/marvell/phy-pxa-28nm-hsic.c
··· 162 162 { 163 163 struct phy_provider *phy_provider; 164 164 struct mv_hsic_phy *mv_phy; 165 - struct resource *r; 166 165 167 166 mv_phy = devm_kzalloc(&pdev->dev, sizeof(*mv_phy), GFP_KERNEL); 168 167 if (!mv_phy) ··· 175 176 return PTR_ERR(mv_phy->clk); 176 177 } 177 178 178 - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 179 - mv_phy->base = devm_ioremap_resource(&pdev->dev, r); 179 + mv_phy->base = devm_platform_ioremap_resource(pdev, 0); 180 180 if (IS_ERR(mv_phy->base)) 181 181 return PTR_ERR(mv_phy->base); 182 182
+1 -3
drivers/phy/marvell/phy-pxa-28nm-usb2.c
··· 294 294 { 295 295 struct phy_provider *phy_provider; 296 296 struct mv_usb2_phy *mv_phy; 297 - struct resource *r; 298 297 299 298 mv_phy = devm_kzalloc(&pdev->dev, sizeof(*mv_phy), GFP_KERNEL); 300 299 if (!mv_phy) ··· 307 308 return PTR_ERR(mv_phy->clk); 308 309 } 309 310 310 - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 311 - mv_phy->base = devm_ioremap_resource(&pdev->dev, r); 311 + mv_phy->base = devm_platform_ioremap_resource(pdev, 0); 312 312 if (IS_ERR(mv_phy->base)) 313 313 return PTR_ERR(mv_phy->base); 314 314
+1 -3
drivers/phy/marvell/phy-pxa-usb.c
··· 286 286 static int pxa_usb_phy_probe(struct platform_device *pdev) 287 287 { 288 288 struct device *dev = &pdev->dev; 289 - struct resource *resource; 290 289 struct pxa_usb_phy *pxa_usb_phy; 291 290 struct phy_provider *provider; 292 291 const struct of_device_id *of_id; ··· 300 301 else 301 302 pxa_usb_phy->version = PXA_USB_PHY_MMP2; 302 303 303 - resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); 304 - pxa_usb_phy->base = devm_ioremap_resource(dev, resource); 304 + pxa_usb_phy->base = devm_platform_ioremap_resource(pdev, 0); 305 305 if (IS_ERR(pxa_usb_phy->base)) { 306 306 dev_err(dev, "failed to remap PHY regs\n"); 307 307 return PTR_ERR(pxa_usb_phy->base);