diff options
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index dfa9e59c9442..738449992876 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
| @@ -3061,15 +3061,11 @@ static int sh_eth_drv_probe(struct platform_device *pdev) | |||
| 3061 | mdp->ether_link_active_low = pd->ether_link_active_low; | 3061 | mdp->ether_link_active_low = pd->ether_link_active_low; |
| 3062 | 3062 | ||
| 3063 | /* set cpu data */ | 3063 | /* set cpu data */ |
| 3064 | if (id) { | 3064 | if (id) |
| 3065 | mdp->cd = (struct sh_eth_cpu_data *)id->driver_data; | 3065 | mdp->cd = (struct sh_eth_cpu_data *)id->driver_data; |
| 3066 | } else { | 3066 | else |
| 3067 | const struct of_device_id *match; | 3067 | mdp->cd = (struct sh_eth_cpu_data *)of_device_get_match_data(&pdev->dev); |
| 3068 | 3068 | ||
| 3069 | match = of_match_device(of_match_ptr(sh_eth_match_table), | ||
| 3070 | &pdev->dev); | ||
| 3071 | mdp->cd = (struct sh_eth_cpu_data *)match->data; | ||
| 3072 | } | ||
| 3073 | mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type); | 3069 | mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type); |
| 3074 | if (!mdp->reg_offset) { | 3070 | if (!mdp->reg_offset) { |
| 3075 | dev_err(&pdev->dev, "Unknown register type (%d)\n", | 3071 | dev_err(&pdev->dev, "Unknown register type (%d)\n", |
