redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sh_eth: get Ether port # only when needed 

The dual-port Ether configurations always have a shared TSU to e.g. pass
the packets between those  ports.  With the  TSU init. code gathered under
the single *if*, we now can only get the port # from 'platform_device::id'
only when we actually  need it  (and not recalculate it each time)...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Sergei Shtylyov 2018-01-14 20:47:44 +03:00 committed by David S. Miller
parent 3e14c969a4
commit 9662ec1922
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/renesas/sh_eth.c
View File

@ -3125,7 +3125,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
const struct platform_device_id *id = platform_get_device_id(pdev);
struct sh_eth_private *mdp;
struct net_device *ndev;
int ret, devno;
int ret;
/* get base addr */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@ -3137,10 +3137,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
pm_runtime_get_sync(&pdev->dev);
devno = pdev->id;
if (devno < 0)
devno = 0;
ret = platform_get_irq(pdev, 0);
if (ret < 0)
goto out_release;
@ -3223,6 +3219,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
}
if (mdp->cd->tsu) {
int port = pdev->id < 0 ? 0 : pdev->id % 2;
struct resource *rtsu;
rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@ -3234,7 +3231,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* We can only request the TSU region for the first port
* of the two sharing this TSU for the probe to succeed...
*/
if (devno % 2 == 0 &&
if (port == 0 &&
!devm_request_mem_region(&pdev->dev, rtsu->start,
resource_size(rtsu),
dev_name(&pdev->dev))) {
@ -3250,11 +3247,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
ret = -ENOMEM;
goto out_release;
}
mdp->port = devno % 2;
mdp->port = port;
ndev->features = NETIF_F_HW_VLAN_CTAG_FILTER;
/* Need to init only the first port of the two sharing a TSU */
if (devno % 2 == 0) {
if (port == 0) {
if (mdp->cd->chip_reset)
mdp->cd->chip_reset(ndev);