Commit e89a2cdb authored by Yang Yingliang's avatar Yang Yingliang Committed by David S. Miller
Browse files

net: ethernet: ravb: Use devm_platform_get_and_ioremap_resource() 



Use devm_platform_get_and_ioremap_resource() to simplify
code.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarSergei Shtylyov <sergei.shtylyov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c32a3d3

drivers/net/ethernet/renesas/ravb_main.c

+4 −11
Original line number Diff line number Diff line
@@ -2047,13 +2047,6 @@ static int ravb_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	/* Get base address */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "invalid resource\n");

		return -EINVAL;

	}



	ndev = alloc_etherdev_mqs(sizeof(struct ravb_private),

				  NUM_TX_QUEUE, NUM_RX_QUEUE);

	if (!ndev)
@@ -2065,9 +2058,6 @@ static int ravb_probe(struct platform_device *pdev) 
	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);



	/* The Ether-specific entries in the device structure. */

	ndev->base_addr = res->start;



	chip_id = (enum ravb_chip_id)of_device_get_match_data(&pdev->dev);



	if (chip_id == RCAR_GEN3)
@@ -2089,12 +2079,15 @@ static int ravb_probe(struct platform_device *pdev) 
	priv->num_rx_ring[RAVB_BE] = BE_RX_RING_SIZE;

	priv->num_tx_ring[RAVB_NC] = NC_TX_RING_SIZE;

	priv->num_rx_ring[RAVB_NC] = NC_RX_RING_SIZE;

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

	priv->addr = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(priv->addr)) {

		error = PTR_ERR(priv->addr);

		goto out_release;

	}



	/* The Ether-specific entries in the device structure. */

	ndev->base_addr = res->start;



	spin_lock_init(&priv->lock);

	INIT_WORK(&priv->work, ravb_tx_timeout_work);