Commit ee55b501 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Vinod Koul
Browse files

phy: marvell: convert to devm_platform_ioremap_resource 



Use devm_platform_ioremap_resource to simplify code

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


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 6c9111bc

drivers/phy/marvell/phy-armada375-usb2.c

+1 −3
Original line number Diff line number Diff line
@@ -105,15 +105,13 @@ static int armada375_usb_phy_probe(struct platform_device *pdev) 
	struct phy *phy;

	struct phy_provider *phy_provider;

	void __iomem *usb_cluster_base;

	struct resource *res;

	struct armada375_cluster_phy *cluster_phy;



	cluster_phy = devm_kzalloc(dev, sizeof(*cluster_phy), GFP_KERNEL);

	if (!cluster_phy)

		return  -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	usb_cluster_base = devm_ioremap_resource(&pdev->dev, res);

	usb_cluster_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(usb_cluster_base))

		return PTR_ERR(usb_cluster_base);

drivers/phy/marvell/phy-berlin-usb.c

+1 −3
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ static int phy_berlin_usb_probe(struct platform_device *pdev) 
	const struct of_device_id *match =

		of_match_device(phy_berlin_usb_of_match, &pdev->dev);

	struct phy_berlin_usb_priv *priv;

	struct resource *res;

	struct phy *phy;

	struct phy_provider *phy_provider;
@@ -173,8 +172,7 @@ static int phy_berlin_usb_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(&pdev->dev, res);

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))

		return PTR_ERR(priv->base);

drivers/phy/marvell/phy-mmp3-usb.c

+1 −3
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ MODULE_DEVICE_TABLE(of, mmp3_usb_phy_of_match); 
static int mmp3_usb_phy_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct resource *resource;

	struct mmp3_usb_phy *mmp3_usb_phy;

	struct phy_provider *provider;
@@ -254,8 +253,7 @@ static int mmp3_usb_phy_probe(struct platform_device *pdev) 
	if (!mmp3_usb_phy)

		return -ENOMEM;



	resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mmp3_usb_phy->base = devm_ioremap_resource(dev, resource);

	mmp3_usb_phy->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(mmp3_usb_phy->base)) {

		dev_err(dev, "failed to remap PHY regs\n");

		return PTR_ERR(mmp3_usb_phy->base);

drivers/phy/marvell/phy-mvebu-sata.c

+1 −3
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static const struct phy_ops phy_mvebu_sata_ops = { 
static int phy_mvebu_sata_probe(struct platform_device *pdev)

{

	struct phy_provider *phy_provider;

	struct resource *res;

	struct priv *priv;

	struct phy *phy;
@@ -88,8 +87,7 @@ static int phy_mvebu_sata_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(&pdev->dev, res);

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base))

		return PTR_ERR(priv->base);

drivers/phy/marvell/phy-pxa-28nm-hsic.c

+1 −3
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static int mv_hsic_phy_probe(struct platform_device *pdev) 
{

	struct phy_provider *phy_provider;

	struct mv_hsic_phy *mv_phy;

	struct resource *r;



	mv_phy = devm_kzalloc(&pdev->dev, sizeof(*mv_phy), GFP_KERNEL);

	if (!mv_phy)
@@ -176,8 +175,7 @@ static int mv_hsic_phy_probe(struct platform_device *pdev) 
		return PTR_ERR(mv_phy->clk);

	}



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mv_phy->base = devm_ioremap_resource(&pdev->dev, r);

	mv_phy->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(mv_phy->base))

		return PTR_ERR(mv_phy->base);