net: phy: meson-gxl: clean-up gxl variant driver
authorJerome Brunet <jbrunet@baylibre.com>
Thu, 4 Apr 2019 13:11:47 +0000 (15:11 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 7 Apr 2019 01:16:58 +0000 (18:16 -0700)
The purpose of this change is to align the gxl and g12a driver
declaration.

Like on the g12a variant, remove genphy_aneg_done() from the driver
declaration as the net phy framework will default to it anyway.

Also, the gxl phy id should be an exact match as well, so let's change
this and use the macro provided.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/meson-gxl.c

index 2033c93a46ca8b436f2fd2b32821d8832b612b2f..6d4a8c508ec0c91f0ef82c4005fd9ab7fb8a7b90 100644 (file)
@@ -224,14 +224,12 @@ static int meson_gxl_config_intr(struct phy_device *phydev)
 
 static struct phy_driver meson_gxl_phy[] = {
        {
-               .phy_id         = 0x01814400,
-               .phy_id_mask    = 0xfffffff0,
+               PHY_ID_MATCH_EXACT(0x01814400),
                .name           = "Meson GXL Internal PHY",
                .features       = PHY_BASIC_FEATURES,
                .flags          = PHY_IS_INTERNAL,
                .soft_reset     = genphy_soft_reset,
                .config_init    = meson_gxl_config_init,
-               .aneg_done      = genphy_aneg_done,
                .read_status    = meson_gxl_read_status,
                .ack_interrupt  = meson_gxl_ack_interrupt,
                .config_intr    = meson_gxl_config_intr,
@@ -251,7 +249,7 @@ static struct phy_driver meson_gxl_phy[] = {
 };
 
 static struct mdio_device_id __maybe_unused meson_gxl_tbl[] = {
-       { 0x01814400, 0xfffffff0 },
+       { PHY_ID_MATCH_VENDOR(0x01814400) },
        { PHY_ID_MATCH_VENDOR(0x01803301) },
        { }
 };