Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: phy: broadcom: Convert to PHY_ID_MATCH_MODEL macro
Convert the pattern phy_id phy_id_mask to the generic PHY_ID_MATCH_MODEL
macro to drop hardcoding magic mask.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Link: https://patch.msgid.link/20250911130840.23569-3-ansuelsmth@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
authored by
Christian Marangi
and committed by
Jakub Kicinski
16116668
64d1726b
+42
-63
+42
-63
drivers/net/phy/broadcom.c
+42
-63
drivers/net/phy/broadcom.c
···
1436
1436
1437
1437
static struct phy_driver broadcom_drivers[] = {
1438
1438
{
1439
-
.phy_id = PHY_ID_BCM5411,
1440
-
.phy_id_mask = 0xfffffff0,
1439
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5411),
1441
1440
.name = "Broadcom BCM5411",
1442
1441
/* PHY_GBIT_FEATURES */
1443
1442
.get_sset_count = bcm_phy_get_sset_count,
···
1448
1449
.handle_interrupt = bcm_phy_handle_interrupt,
1449
1450
.link_change_notify = bcm54xx_link_change_notify,
1450
1451
}, {
1451
-
.phy_id = PHY_ID_BCM5421,
1452
-
.phy_id_mask = 0xfffffff0,
1452
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5421),
1453
1453
.name = "Broadcom BCM5421",
1454
1454
/* PHY_GBIT_FEATURES */
1455
1455
.get_sset_count = bcm_phy_get_sset_count,
···
1460
1462
.handle_interrupt = bcm_phy_handle_interrupt,
1461
1463
.link_change_notify = bcm54xx_link_change_notify,
1462
1464
}, {
1463
-
.phy_id = PHY_ID_BCM54210E,
1464
-
.phy_id_mask = 0xfffffff0,
1465
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM54210E),
1465
1466
.name = "Broadcom BCM54210E",
1466
1467
/* PHY_GBIT_FEATURES */
1467
1468
.flags = PHY_ALWAYS_CALL_SUSPEND,
···
1478
1481
.set_wol = bcm54xx_phy_set_wol,
1479
1482
.led_brightness_set = bcm_phy_led_brightness_set,
1480
1483
}, {
1481
-
.phy_id = PHY_ID_BCM5461,
1482
-
.phy_id_mask = 0xfffffff0,
1484
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5461),
1483
1485
.name = "Broadcom BCM5461",
1484
1486
/* PHY_GBIT_FEATURES */
1485
1487
.get_sset_count = bcm_phy_get_sset_count,
···
1491
1495
.link_change_notify = bcm54xx_link_change_notify,
1492
1496
.led_brightness_set = bcm_phy_led_brightness_set,
1493
1497
}, {
1494
-
.phy_id = PHY_ID_BCM54612E,
1495
-
.phy_id_mask = 0xfffffff0,
1498
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM54612E),
1496
1499
.name = "Broadcom BCM54612E",
1497
1500
/* PHY_GBIT_FEATURES */
1498
1501
.get_sset_count = bcm_phy_get_sset_count,
···
1506
1511
.suspend = bcm54xx_suspend,
1507
1512
.resume = bcm54xx_resume,
1508
1513
}, {
1509
-
.phy_id = PHY_ID_BCM54616S,
1510
-
.phy_id_mask = 0xfffffff0,
1514
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM54616S),
1511
1515
.name = "Broadcom BCM54616S",
1512
1516
/* PHY_GBIT_FEATURES */
1513
1517
.soft_reset = genphy_soft_reset,
···
1519
1525
.link_change_notify = bcm54xx_link_change_notify,
1520
1526
.led_brightness_set = bcm_phy_led_brightness_set,
1521
1527
}, {
1522
-
.phy_id = PHY_ID_BCM5464,
1523
-
.phy_id_mask = 0xfffffff0,
1528
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5464),
1524
1529
.name = "Broadcom BCM5464",
1525
1530
/* PHY_GBIT_FEATURES */
1526
1531
.get_sset_count = bcm_phy_get_sset_count,
···
1534
1541
.link_change_notify = bcm54xx_link_change_notify,
1535
1542
.led_brightness_set = bcm_phy_led_brightness_set,
1536
1543
}, {
1537
-
.phy_id = PHY_ID_BCM5481,
1538
-
.phy_id_mask = 0xfffffff0,
1544
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5481),
1539
1545
.name = "Broadcom BCM5481",
1540
1546
/* PHY_GBIT_FEATURES */
1541
1547
.get_sset_count = bcm_phy_get_sset_count,
···
1548
1556
.link_change_notify = bcm54xx_link_change_notify,
1549
1557
.led_brightness_set = bcm_phy_led_brightness_set,
1550
1558
}, {
1551
-
.phy_id = PHY_ID_BCM54810,
1552
-
.phy_id_mask = 0xfffffff0,
1559
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM54810),
1553
1560
.name = "Broadcom BCM54810",
1554
1561
/* PHY_GBIT_FEATURES */
1555
1562
.get_sset_count = bcm_phy_get_sset_count,
···
1566
1575
.link_change_notify = bcm54xx_link_change_notify,
1567
1576
.led_brightness_set = bcm_phy_led_brightness_set,
1568
1577
}, {
1569
-
.phy_id = PHY_ID_BCM54811,
1570
-
.phy_id_mask = 0xfffffff0,
1578
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM54811),
1571
1579
.name = "Broadcom BCM54811",
1572
1580
/* PHY_GBIT_FEATURES */
1573
1581
.get_sset_count = bcm_phy_get_sset_count,
···
1584
1594
.link_change_notify = bcm54xx_link_change_notify,
1585
1595
.led_brightness_set = bcm_phy_led_brightness_set,
1586
1596
}, {
1587
-
.phy_id = PHY_ID_BCM5482,
1588
-
.phy_id_mask = 0xfffffff0,
1597
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5482),
1589
1598
.name = "Broadcom BCM5482",
1590
1599
/* PHY_GBIT_FEATURES */
1591
1600
.get_sset_count = bcm_phy_get_sset_count,
···
1597
1608
.link_change_notify = bcm54xx_link_change_notify,
1598
1609
.led_brightness_set = bcm_phy_led_brightness_set,
1599
1610
}, {
1600
-
.phy_id = PHY_ID_BCM50610,
1601
-
.phy_id_mask = 0xfffffff0,
1611
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM50610),
1602
1612
.name = "Broadcom BCM50610",
1603
1613
/* PHY_GBIT_FEATURES */
1604
1614
.get_sset_count = bcm_phy_get_sset_count,
···
1612
1624
.resume = bcm54xx_resume,
1613
1625
.led_brightness_set = bcm_phy_led_brightness_set,
1614
1626
}, {
1615
-
.phy_id = PHY_ID_BCM50610M,
1616
-
.phy_id_mask = 0xfffffff0,
1627
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM50610M),
1617
1628
.name = "Broadcom BCM50610M",
1618
1629
/* PHY_GBIT_FEATURES */
1619
1630
.get_sset_count = bcm_phy_get_sset_count,
···
1627
1640
.resume = bcm54xx_resume,
1628
1641
.led_brightness_set = bcm_phy_led_brightness_set,
1629
1642
}, {
1630
-
.phy_id = PHY_ID_BCM57780,
1631
-
.phy_id_mask = 0xfffffff0,
1643
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM57780),
1632
1644
.name = "Broadcom BCM57780",
1633
1645
/* PHY_GBIT_FEATURES */
1634
1646
.get_sset_count = bcm_phy_get_sset_count,
···
1640
1654
.link_change_notify = bcm54xx_link_change_notify,
1641
1655
.led_brightness_set = bcm_phy_led_brightness_set,
1642
1656
}, {
1643
-
.phy_id = PHY_ID_BCMAC131,
1644
-
.phy_id_mask = 0xfffffff0,
1657
+
PHY_ID_MATCH_MODEL(PHY_ID_BCMAC131),
1645
1658
.name = "Broadcom BCMAC131",
1646
1659
/* PHY_BASIC_FEATURES */
1647
1660
.config_init = brcm_fet_config_init,
···
1649
1664
.suspend = brcm_fet_suspend,
1650
1665
.resume = brcm_fet_config_init,
1651
1666
}, {
1652
-
.phy_id = PHY_ID_BCM5241,
1653
-
.phy_id_mask = 0xfffffff0,
1667
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5241),
1654
1668
.name = "Broadcom BCM5241",
1655
1669
/* PHY_BASIC_FEATURES */
1656
1670
.config_init = brcm_fet_config_init,
···
1658
1674
.suspend = brcm_fet_suspend,
1659
1675
.resume = brcm_fet_config_init,
1660
1676
}, {
1661
-
.phy_id = PHY_ID_BCM5221,
1662
-
.phy_id_mask = 0xfffffff0,
1677
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5221),
1663
1678
.name = "Broadcom BCM5221",
1664
1679
/* PHY_BASIC_FEATURES */
1665
1680
.config_init = brcm_fet_config_init,
···
1669
1686
.config_aneg = bcm5221_config_aneg,
1670
1687
.read_status = bcm5221_read_status,
1671
1688
}, {
1672
-
.phy_id = PHY_ID_BCM5395,
1673
-
.phy_id_mask = 0xfffffff0,
1689
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM5395),
1674
1690
.name = "Broadcom BCM5395",
1675
1691
.flags = PHY_IS_INTERNAL,
1676
1692
/* PHY_GBIT_FEATURES */
···
1680
1698
.link_change_notify = bcm54xx_link_change_notify,
1681
1699
.led_brightness_set = bcm_phy_led_brightness_set,
1682
1700
}, {
1683
-
.phy_id = PHY_ID_BCM53125,
1684
-
.phy_id_mask = 0xfffffff0,
1701
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM53125),
1685
1702
.name = "Broadcom BCM53125",
1686
1703
.flags = PHY_IS_INTERNAL,
1687
1704
/* PHY_GBIT_FEATURES */
···
1694
1713
.link_change_notify = bcm54xx_link_change_notify,
1695
1714
.led_brightness_set = bcm_phy_led_brightness_set,
1696
1715
}, {
1697
-
.phy_id = PHY_ID_BCM53128,
1698
-
.phy_id_mask = 0xfffffff0,
1716
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM53128),
1699
1717
.name = "Broadcom BCM53128",
1700
1718
.flags = PHY_IS_INTERNAL,
1701
1719
/* PHY_GBIT_FEATURES */
···
1708
1728
.link_change_notify = bcm54xx_link_change_notify,
1709
1729
.led_brightness_set = bcm_phy_led_brightness_set,
1710
1730
}, {
1711
-
.phy_id = PHY_ID_BCM89610,
1712
-
.phy_id_mask = 0xfffffff0,
1731
+
PHY_ID_MATCH_MODEL(PHY_ID_BCM89610),
1713
1732
.name = "Broadcom BCM89610",
1714
1733
/* PHY_GBIT_FEATURES */
1715
1734
.get_sset_count = bcm_phy_get_sset_count,
···
1724
1745
module_phy_driver(broadcom_drivers);
1725
1746
1726
1747
static const struct mdio_device_id __maybe_unused broadcom_tbl[] = {
1727
-
{ PHY_ID_BCM5411, 0xfffffff0 },
1728
-
{ PHY_ID_BCM5421, 0xfffffff0 },
1729
-
{ PHY_ID_BCM54210E, 0xfffffff0 },
1730
-
{ PHY_ID_BCM5461, 0xfffffff0 },
1731
-
{ PHY_ID_BCM54612E, 0xfffffff0 },
1732
-
{ PHY_ID_BCM54616S, 0xfffffff0 },
1733
-
{ PHY_ID_BCM5464, 0xfffffff0 },
1734
-
{ PHY_ID_BCM5481, 0xfffffff0 },
1735
-
{ PHY_ID_BCM54810, 0xfffffff0 },
1736
-
{ PHY_ID_BCM54811, 0xfffffff0 },
1737
-
{ PHY_ID_BCM5482, 0xfffffff0 },
1738
-
{ PHY_ID_BCM50610, 0xfffffff0 },
1739
-
{ PHY_ID_BCM50610M, 0xfffffff0 },
1740
-
{ PHY_ID_BCM57780, 0xfffffff0 },
1741
-
{ PHY_ID_BCMAC131, 0xfffffff0 },
1742
-
{ PHY_ID_BCM5221, 0xfffffff0 },
1743
-
{ PHY_ID_BCM5241, 0xfffffff0 },
1744
-
{ PHY_ID_BCM5395, 0xfffffff0 },
1745
-
{ PHY_ID_BCM53125, 0xfffffff0 },
1746
-
{ PHY_ID_BCM53128, 0xfffffff0 },
1747
-
{ PHY_ID_BCM89610, 0xfffffff0 },
1748
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5411) },
1749
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5421) },
1750
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM54210E) },
1751
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5461) },
1752
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM54612E) },
1753
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM54616S) },
1754
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5464) },
1755
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5481) },
1756
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM54810) },
1757
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM54811) },
1758
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5482) },
1759
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM50610) },
1760
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM50610M) },
1761
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM57780) },
1762
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCMAC131) },
1763
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5221) },
1764
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5241) },
1765
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM5395) },
1766
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM53125) },
1767
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM53128) },
1768
+
{ PHY_ID_MATCH_MODEL(PHY_ID_BCM89610) },
1748
1769
{ }
1749
1770
};
1750
1771