]> git.karo-electronics.de Git - linux-beck.git/commitdiff
phy: remove an unneeded condition
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 12 Jan 2016 09:36:21 +0000 (12:36 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Jan 2016 16:51:58 +0000 (11:51 -0500)
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>
drivers/net/phy/phy_device.c

index 319300627c0bb730bf6b934925771c8e02741c4d..903737adfc019824998e4a1315e1438e03618852 100644 (file)
@@ -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;