net: dsa: mv88e6xxx: Fix W=1 warning with !CONFIG_OF
authorAndrew Lunn <andrew@lunn.ch>
Tue, 1 Sep 2020 02:32:57 +0000 (04:32 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Sep 2020 22:33:57 +0000 (15:33 -0700)
When building on platforms without device tree, e.g. amd64, W=1 gives
a warning about mv88e6xxx_mdio_external_match being unused. Replace
of_match_node() with of_device_is_compatible() to prevent this
warning.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6xxx/chip.c

index 7a71c99..895d7b6 100644 (file)
@@ -3329,12 +3329,6 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
        return 0;
 }
 
-static const struct of_device_id mv88e6xxx_mdio_external_match[] = {
-       { .compatible = "marvell,mv88e6xxx-mdio-external",
-         .data = (void *)true },
-       { },
-};
-
 static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip)
 
 {
@@ -3354,7 +3348,6 @@ static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip)
 static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,
                                    struct device_node *np)
 {
-       const struct of_device_id *match;
        struct device_node *child;
        int err;
 
@@ -3372,8 +3365,8 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,
         * bus.
         */
        for_each_available_child_of_node(np, child) {
-               match = of_match_node(mv88e6xxx_mdio_external_match, child);
-               if (match) {
+               if (of_device_is_compatible(
+                           child, "marvell,mv88e6xxx-mdio-external")) {
                        err = mv88e6xxx_mdio_register(chip, child, true);
                        if (err) {
                                mv88e6xxx_mdios_unregister(chip);