Commit fa629094 authored Nov 06, 2020 by Chunfeng Yun Committed by Vinod Koul Nov 16, 2020

phy: cadence: convert to devm_platform_ioremap_resource



Use devm_platform_ioremap_resource to simplify code

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Acked-by: Peter Chen <peter.chen@nxp.com>
Link: https://lore.kernel.org/r/1604642930-29019-4-git-send-email-chunfeng.yun@mediatek.com


Signed-off-by: Vinod Koul <vkoul@kernel.org>

parent f669bc8b

drivers/phy/cadence/cdns-dphy.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -314,7 +314,6 @@ static int cdns_dphy_probe(struct platform_device *pdev)
	{		{
	struct phy_provider *phy_provider;		struct phy_provider *phy_provider;
	struct cdns_dphy *dphy;		struct cdns_dphy *dphy;
	struct resource *res;
	int ret;		int ret;

	dphy = devm_kzalloc(&pdev->dev, sizeof(*dphy), GFP_KERNEL);		dphy = devm_kzalloc(&pdev->dev, sizeof(*dphy), GFP_KERNEL);
	@@ -326,8 +325,7 @@ static int cdns_dphy_probe(struct platform_device *pdev)
	if (!dphy->ops)		if (!dphy->ops)
	return -EINVAL;		return -EINVAL;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);		dphy->regs = devm_platform_ioremap_resource(pdev, 0);
	dphy->regs = devm_ioremap_resource(&pdev->dev, res);
	if (IS_ERR(dphy->regs))		if (IS_ERR(dphy->regs))
	return PTR_ERR(dphy->regs);		return PTR_ERR(dphy->regs);

drivers/phy/cadence/phy-cadence-salvo.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -263,7 +263,6 @@ static int cdns_salvo_phy_probe(struct platform_device *pdev)
	struct phy_provider *phy_provider;		struct phy_provider *phy_provider;
	struct device *dev = &pdev->dev;		struct device *dev = &pdev->dev;
	struct cdns_salvo_phy *salvo_phy;		struct cdns_salvo_phy *salvo_phy;
	struct resource *res;
	const struct of_device_id *match;		const struct of_device_id *match;
	struct cdns_salvo_data *data;		struct cdns_salvo_data *data;

	@@ -281,8 +280,7 @@ static int cdns_salvo_phy_probe(struct platform_device *pdev)
	if (IS_ERR(salvo_phy->clk))		if (IS_ERR(salvo_phy->clk))
	return PTR_ERR(salvo_phy->clk);		return PTR_ERR(salvo_phy->clk);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);		salvo_phy->base = devm_platform_ioremap_resource(pdev, 0);
	salvo_phy->base = devm_ioremap_resource(dev, res);
	if (IS_ERR(salvo_phy->base))		if (IS_ERR(salvo_phy->base))
	return PTR_ERR(salvo_phy->base);		return PTR_ERR(salvo_phy->base);

drivers/phy/cadence/phy-cadence-sierra.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -479,7 +479,6 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev)
	const struct of_device_id *match;		const struct of_device_id *match;
	struct cdns_sierra_data *data;		struct cdns_sierra_data *data;
	unsigned int id_value;		unsigned int id_value;
	struct resource *res;
	int i, ret, node = 0;		int i, ret, node = 0;
	void __iomem *base;		void __iomem *base;
	struct clk *clk;		struct clk *clk;
	@@ -502,8 +501,7 @@ static int cdns_sierra_phy_probe(struct platform_device *pdev)
	sp->dev = dev;		sp->dev = dev;
	sp->init_data = data;		sp->init_data = data;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);		base = devm_platform_ioremap_resource(pdev, 0);
	base = devm_ioremap_resource(dev, res);
	if (IS_ERR(base)) {		if (IS_ERR(base)) {
	dev_err(dev, "missing \"reg\"\n");		dev_err(dev, "missing \"reg\"\n");
	return PTR_ERR(base);		return PTR_ERR(base);