Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56170ba3 authored by Jiangfeng Xiao's avatar Jiangfeng Xiao Committed by David S. Miller
Browse files

net: hisilicon: Use devm_platform_ioremap_resource 



Use devm_platform_ioremap_resource instead of
devm_ioremap_resource. Make the code simpler.

Signed-off-by: default avatarJiangfeng Xiao <xiaojiangfeng@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 752c2ea2

drivers/net/ethernet/hisilicon/hip04_eth.c

+2 −5
Original line number Diff line number Diff line
@@ -899,7 +899,6 @@ static int hip04_mac_probe(struct platform_device *pdev) 
	struct of_phandle_args arg;

	struct net_device *ndev;

	struct hip04_priv *priv;

	struct resource *res;

	int irq;

	int ret;
@@ -912,16 +911,14 @@ static int hip04_mac_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ndev);

	SET_NETDEV_DEV(ndev, &pdev->dev);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(d, res);

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

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto init_fail;

	}



#if defined(CONFIG_HI13X1_GMAC)

	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->sysctrl_base = devm_ioremap_resource(d, res);

	priv->sysctrl_base = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(priv->sysctrl_base)) {

		ret = PTR_ERR(priv->sysctrl_base);

		goto init_fail;

drivers/net/ethernet/hisilicon/hisi_femac.c

+2 −5
Original line number Diff line number Diff line
@@ -781,7 +781,6 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->of_node;

	struct resource *res;

	struct net_device *ndev;

	struct hisi_femac_priv *priv;

	struct phy_device *phy;
@@ -799,15 +798,13 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) 
	priv->dev = dev;

	priv->ndev = ndev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->port_base = devm_ioremap_resource(dev, res);

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

	if (IS_ERR(priv->port_base)) {

		ret = PTR_ERR(priv->port_base);

		goto out_free_netdev;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->glb_base = devm_ioremap_resource(dev, res);

	priv->glb_base = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(priv->glb_base)) {

		ret = PTR_ERR(priv->glb_base);

		goto out_free_netdev;

drivers/net/ethernet/hisilicon/hix5hd2_gmac.c

+2 −5
Original line number Diff line number Diff line
@@ -1097,7 +1097,6 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) 
	const struct of_device_id *of_id = NULL;

	struct net_device *ndev;

	struct hix5hd2_priv *priv;

	struct resource *res;

	struct mii_bus *bus;

	const char *mac_addr;

	int ret;
@@ -1119,15 +1118,13 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) 
	}

	priv->hw_cap = (unsigned long)of_id->data;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto out_free_netdev;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->ctrl_base = devm_ioremap_resource(dev, res);

	priv->ctrl_base = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(priv->ctrl_base)) {

		ret = PTR_ERR(priv->ctrl_base);

		goto out_free_netdev;

drivers/net/ethernet/hisilicon/hns_mdio.c

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

	struct hns_mdio_device *mdio_dev;

	struct mii_bus *new_bus;

	struct resource *res;

	int ret = -ENODEV;



	if (!pdev) {
@@ -442,8 +441,7 @@ static int hns_mdio_probe(struct platform_device *pdev) 
	new_bus->priv = mdio_dev;

	new_bus->parent = &pdev->dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	mdio_dev->vbase = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(mdio_dev->vbase)) {

		ret = PTR_ERR(mdio_dev->vbase);

		return ret;