diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-01-12 12:36:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-12 11:51:58 -0500 |
| commit | 47b356e499f26d330ab6ae4019e8c05f994be62d (patch) | |
| tree | db0bc7ccc0f45f2f790e641eaa2a77ae4e9163e2 /drivers | |
| parent | 1bc16addc0e92222958010537557b18e25a278c0 (diff) | |
| download | linux-stable-47b356e499f26d330ab6ae4019e8c05f994be62d.tar.gz linux-stable-47b356e499f26d330ab6ae4019e8c05f994be62d.tar.bz2 linux-stable-47b356e499f26d330ab6ae4019e8c05f994be62d.zip | |
phy: remove an unneeded condition
It used to be that bus->irq was a pointer but after e7f4dc3536a4
('mdio: Move allocation of interrupts into core') it's an array inside
the mdio struct, so it can never be NULL. Let's remove the check.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 319300627c0b..903737adfc01 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -340,7 +340,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, dev->phy_id = phy_id; if (c45_ids) dev->c45_ids = *c45_ids; - dev->irq = bus->irq ? bus->irq[addr] : PHY_POLL; + dev->irq = bus->irq[addr]; dev_set_name(&mdiodev->dev, PHY_ID_FMT, bus->id, addr); dev->state = PHY_DOWN; |