net: phy: bcm7xxx: introduce helper macro

All 28nm Gigabit PHYs supported by the driver have the same
callbacks, the only differences being the 32-bits OUI and the name. Use
a macro to factor this, making it easier in the future to add new
entries.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index e98c510b75c523de11cb2f238969d2c4c7581d5d..948c7086679a23e1a0644f74de404fc5dac1bda5 100644 (file)
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -319,44 +319,26 @@ static int bcm7xxx_dummy_config_init(struct phy_device *phydev)
        return 0;
 }
 
+#define BCM7XXX_28NM_GPHY(_oui, _name)                                 \
+{                                                                      \
+       .phy_id         = (_oui),                                       \
+       .phy_id_mask    = 0xfffffff0,                                   \
+       .name           = _name,                                        \
+       .features       = PHY_GBIT_FEATURES |                           \
+                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,       \
+       .flags          = PHY_IS_INTERNAL,                              \
+       .config_init    = bcm7xxx_28nm_afe_config_init,                 \
+       .config_aneg    = genphy_config_aneg,                           \
+       .read_status    = genphy_read_status,                           \
+       .resume         = bcm7xxx_28nm_resume,                          \
+       .driver         = { .owner = THIS_MODULE },                     \
+}
+
 static struct phy_driver bcm7xxx_driver[] = {
+       BCM7XXX_28NM_GPHY(PHY_ID_BCM7366, "Broadcom BCM7366"),
+       BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
+       BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),
 {
-       .phy_id         = PHY_ID_BCM7366,
-       .phy_id_mask    = 0xfffffff0,
-       .name           = "Broadcom BCM7366",
-       .features       = PHY_GBIT_FEATURES |
-                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-       .flags          = PHY_IS_INTERNAL,
-       .config_init    = bcm7xxx_28nm_afe_config_init,
-       .config_aneg    = genphy_config_aneg,
-       .read_status    = genphy_read_status,
-       .resume         = bcm7xxx_28nm_resume,
-       .driver         = { .owner = THIS_MODULE },
-}, {
-       .phy_id         = PHY_ID_BCM7439,
-       .phy_id_mask    = 0xfffffff0,
-       .name           = "Broadcom BCM7439",
-       .features       = PHY_GBIT_FEATURES |
-                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-       .flags          = PHY_IS_INTERNAL,
-       .config_init    = bcm7xxx_28nm_afe_config_init,
-       .config_aneg    = genphy_config_aneg,
-       .read_status    = genphy_read_status,
-       .resume         = bcm7xxx_28nm_resume,
-       .driver         = { .owner = THIS_MODULE },
-}, {
-       .phy_id         = PHY_ID_BCM7445,
-       .phy_id_mask    = 0xfffffff0,
-       .name           = "Broadcom BCM7445",
-       .features       = PHY_GBIT_FEATURES |
-                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
-       .flags          = PHY_IS_INTERNAL,
-       .config_init    = bcm7xxx_28nm_config_init,
-       .config_aneg    = genphy_config_aneg,
-       .read_status    = genphy_read_status,
-       .resume         = bcm7xxx_28nm_afe_config_init,
-       .driver         = { .owner = THIS_MODULE },
-}, {
        .phy_id         = PHY_BCM_OUI_4,
        .phy_id_mask    = 0xffff0000,
        .name           = "Broadcom BCM7XXX 40nm",