| Message ID | 20160112093534.GE29804@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jan 12, 2016 at 12:35:34PM +0300, Dan Carpenter wrote: > It used to be that mdio->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. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> For both patches: Reviewd-by: Andrew Lunn <andrew@lunn.ch> Thanks Andrew > > diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c > index c0a8f84..86829f8 100644 > --- a/drivers/of/of_mdio.c > +++ b/drivers/of/of_mdio.c > @@ -62,11 +62,9 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi > rc = irq_of_parse_and_map(child, 0); > if (rc > 0) { > phy->irq = rc; > - if (mdio->irq) > - mdio->irq[addr] = rc; > + mdio->irq[addr] = rc; > } else { > - if (mdio->irq) > - phy->irq = mdio->irq[addr]; > + phy->irq = mdio->irq[addr]; > } > > if (of_property_read_bool(child, "broken-turn-around"))
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Tue, 12 Jan 2016 12:35:34 +0300 > It used to be that mdio->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. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied.
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index c0a8f84..86829f8 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -62,11 +62,9 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi rc = irq_of_parse_and_map(child, 0); if (rc > 0) { phy->irq = rc; - if (mdio->irq) - mdio->irq[addr] = rc; + mdio->irq[addr] = rc; } else { - if (mdio->irq) - phy->irq = mdio->irq[addr]; + phy->irq = mdio->irq[addr]; } if (of_property_read_bool(child, "broken-turn-around"))
It used to be that mdio->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. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>