OSDN Git Service

stmmac: drop unnecessary dt checks in stmmac_probe_config_dt
authorJoachim Eastwood <manabian@gmail.com>
Wed, 20 May 2015 18:03:09 +0000 (20:03 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 May 2015 22:57:26 +0000 (18:57 -0400)
Since the caller already check the presence of a of_node there
is no need to repeat the check in stmmac_probe_config_dt.

There is also no point in checking the return value of the
of_match_device function since if there wasn't match in the
first place we would never be in this function.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

index e8d4c96..1664c01 100644 (file)
@@ -112,13 +112,7 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
        const struct of_device_id *device;
        struct device *dev = &pdev->dev;
 
-       if (!np)
-               return -ENODEV;
-
        device = of_match_device(dev->driver->of_match_table, dev);
-       if (!device)
-               return -ENODEV;
-
        if (device->data) {
                const struct stmmac_of_data *data = device->data;
                plat->has_gmac = data->has_gmac;