* [patch 2/2 -next] phy: remove an unneeded condition
@ 2016-01-12 9:36 Dan Carpenter
2016-01-12 19:31 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-01-12 9:36 UTC (permalink / raw)
To: Florian Fainelli, Andrew Lunn; +Cc: netdev, linux-kernel, kernel-janitors
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.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 3193006..903737a 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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-12 19:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-12 9:36 [patch 2/2 -next] phy: remove an unneeded condition Dan Carpenter
2016-01-12 19:31 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).