diff options
| author |   Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-05-07 22:53:40 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-09 00:13:18 -0400 |
| commit | 59efcbaf434964f324928619fcd0a6f506134753 (patch) | |
| tree | ed1e37c8a70e10e9e53f03d49ed89e14dab8bb3e /drivers/net/ethernet/marvell | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next (diff) | |
| download | linux-dev-59efcbaf434964f324928619fcd0a6f506134753.tar.xz linux-dev-59efcbaf434964f324928619fcd0a6f506134753.zip | |
pxa168_eth: mdiobus_scan() doesn't return NULL anymore
Now that mdiobus_scan() doesn't return NULL on failure anymore, this driver
no longer needs to check for it...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 15cf50d7e316..89d0d835352e 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -981,8 +981,6 @@ static int pxa168_init_phy(struct net_device *dev) pep->phy = mdiobus_scan(pep->smi_bus, pep->phy_addr); if (IS_ERR(pep->phy)) return PTR_ERR(pep->phy); - if (!pep->phy) - return -ENODEV; err = phy_connect_direct(dev, pep->phy, pxa168_eth_adjust_link, pep->phy_intf); |