Skip to content

Commit

Permalink
of_mdio: make of_mdiobus_register_{device|phy}() *void*
Browse files Browse the repository at this point in the history
The results of of_mdiobus_register_{device|phy}() are never checked, so we
can make  both these functions *void*...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sergei Shtylyov authored and David S. Miller committed Apr 19, 2016
1 parent e760044 commit b520bd0
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions drivers/of/of_mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ static int of_get_phy_id(struct device_node *device, u32 *phy_id)
return -EINVAL;
}

static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *child,
u32 addr)
static void of_mdiobus_register_phy(struct mii_bus *mdio,
struct device_node *child, u32 addr)
{
struct phy_device *phy;
bool is_c45;
Expand All @@ -57,7 +57,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
else
phy = get_phy_device(mdio, addr, is_c45);
if (IS_ERR_OR_NULL(phy))
return 1;
return;

rc = irq_of_parse_and_map(child, 0);
if (rc > 0) {
Expand All @@ -81,25 +81,22 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
if (rc) {
phy_device_free(phy);
of_node_put(child);
return 1;
return;
}

dev_dbg(&mdio->dev, "registered phy %s at address %i\n",
child->name, addr);

return 0;
}

static int of_mdiobus_register_device(struct mii_bus *mdio,
struct device_node *child,
u32 addr)
static void of_mdiobus_register_device(struct mii_bus *mdio,
struct device_node *child, u32 addr)
{
struct mdio_device *mdiodev;
int rc;

mdiodev = mdio_device_create(mdio, addr);
if (IS_ERR(mdiodev))
return 1;
return;

/* Associate the OF node with the device structure so it
* can be looked up later.
Expand All @@ -112,13 +109,11 @@ static int of_mdiobus_register_device(struct mii_bus *mdio,
if (rc) {
mdio_device_free(mdiodev);
of_node_put(child);
return 1;
return;
}

dev_dbg(&mdio->dev, "registered mdio device %s at address %i\n",
child->name, addr);

return 0;
}

int of_mdio_parse_addr(struct device *dev, const struct device_node *np)
Expand Down

0 comments on commit b520bd0

Please sign in to comment.