net: phy: marvell: use a single style for referencing functions

The kernel in general does not use &func referencing format.

Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index c9ecf3c..ee9c352 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -2625,12 +2625,12 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1101",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &marvell_config_init,
-               .config_aneg = &m88e1101_config_aneg,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = marvell_config_init,
+               .config_aneg = m88e1101_config_aneg,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2643,12 +2643,12 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1112",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1111_config_init,
-               .config_aneg = &marvell_config_aneg,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1111_config_init,
+               .config_aneg = marvell_config_aneg,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2663,13 +2663,13 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1111",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1111_config_init,
-               .config_aneg = &marvell_config_aneg,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1111_config_init,
+               .config_aneg = marvell_config_aneg,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2684,12 +2684,12 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1118",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1118_config_init,
-               .config_aneg = &m88e1118_config_aneg,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1118_config_init,
+               .config_aneg = m88e1118_config_aneg,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2701,15 +2701,15 @@ static struct phy_driver marvell_drivers[] = {
                .phy_id_mask = MARVELL_PHY_ID_MASK,
                .name = "Marvell 88E1121R",
                /* PHY_GBIT_FEATURES */
-               .probe = &m88e1121_probe,
-               .config_init = &marvell_config_init,
-               .config_aneg = &m88e1121_config_aneg,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .did_interrupt = &m88e1121_did_interrupt,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .probe = m88e1121_probe,
+               .config_init = marvell_config_init,
+               .config_aneg = m88e1121_config_aneg,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .did_interrupt = m88e1121_did_interrupt,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2724,16 +2724,16 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1318S",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1318_config_init,
-               .config_aneg = &m88e1318_config_aneg,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .did_interrupt = &m88e1121_did_interrupt,
-               .get_wol = &m88e1318_get_wol,
-               .set_wol = &m88e1318_set_wol,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1318_config_init,
+               .config_aneg = m88e1318_config_aneg,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .did_interrupt = m88e1121_did_interrupt,
+               .get_wol = m88e1318_get_wol,
+               .set_wol = m88e1318_set_wol,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2746,13 +2746,13 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1145",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1145_config_init,
-               .config_aneg = &m88e1101_config_aneg,
-               .read_status = &genphy_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1145_config_init,
+               .config_aneg = m88e1101_config_aneg,
+               .read_status = genphy_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2767,12 +2767,12 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1149R",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1149_config_init,
-               .config_aneg = &m88e1118_config_aneg,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1149_config_init,
+               .config_aneg = m88e1118_config_aneg,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2785,12 +2785,12 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1240",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1111_config_init,
-               .config_aneg = &marvell_config_aneg,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1111_config_init,
+               .config_aneg = marvell_config_aneg,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2803,11 +2803,11 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1116R",
                /* PHY_GBIT_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e1116r_config_init,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e1116r_config_init,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2822,17 +2822,17 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E1510",
                .features = PHY_GBIT_FIBRE_FEATURES,
                .flags = PHY_POLL_CABLE_TEST,
-               .probe = &m88e1510_probe,
-               .config_init = &m88e1510_config_init,
-               .config_aneg = &m88e1510_config_aneg,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .did_interrupt = &m88e1121_did_interrupt,
-               .get_wol = &m88e1318_get_wol,
-               .set_wol = &m88e1318_set_wol,
-               .resume = &marvell_resume,
-               .suspend = &marvell_suspend,
+               .probe = m88e1510_probe,
+               .config_init = m88e1510_config_init,
+               .config_aneg = m88e1510_config_aneg,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .did_interrupt = m88e1121_did_interrupt,
+               .get_wol = m88e1318_get_wol,
+               .set_wol = m88e1318_set_wol,
+               .resume = marvell_resume,
+               .suspend = marvell_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2852,14 +2852,14 @@ static struct phy_driver marvell_drivers[] = {
                /* PHY_GBIT_FEATURES */
                .flags = PHY_POLL_CABLE_TEST,
                .probe = m88e1510_probe,
-               .config_init = &marvell_config_init,
-               .config_aneg = &m88e1510_config_aneg,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .did_interrupt = &m88e1121_did_interrupt,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = marvell_config_init,
+               .config_aneg = m88e1510_config_aneg,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .did_interrupt = m88e1121_did_interrupt,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2878,14 +2878,14 @@ static struct phy_driver marvell_drivers[] = {
                .probe = m88e1510_probe,
                /* PHY_GBIT_FEATURES */
                .flags = PHY_POLL_CABLE_TEST,
-               .config_init = &marvell_config_init,
-               .config_aneg = &m88e1510_config_aneg,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .did_interrupt = &m88e1121_did_interrupt,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = marvell_config_init,
+               .config_aneg = m88e1510_config_aneg,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .did_interrupt = m88e1121_did_interrupt,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2903,14 +2903,14 @@ static struct phy_driver marvell_drivers[] = {
                .name = "Marvell 88E3016",
                /* PHY_BASIC_FEATURES */
                .probe = marvell_probe,
-               .config_init = &m88e3016_config_init,
-               .aneg_done = &marvell_aneg_done,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .did_interrupt = &m88e1121_did_interrupt,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = m88e3016_config_init,
+               .aneg_done = marvell_aneg_done,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .did_interrupt = m88e1121_did_interrupt,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,
@@ -2924,14 +2924,14 @@ static struct phy_driver marvell_drivers[] = {
                /* PHY_GBIT_FEATURES */
                .flags = PHY_POLL_CABLE_TEST,
                .probe = m88e6390_probe,
-               .config_init = &marvell_config_init,
-               .config_aneg = &m88e6390_config_aneg,
-               .read_status = &marvell_read_status,
-               .ack_interrupt = &marvell_ack_interrupt,
-               .config_intr = &marvell_config_intr,
-               .did_interrupt = &m88e1121_did_interrupt,
-               .resume = &genphy_resume,
-               .suspend = &genphy_suspend,
+               .config_init = marvell_config_init,
+               .config_aneg = m88e6390_config_aneg,
+               .read_status = marvell_read_status,
+               .ack_interrupt = marvell_ack_interrupt,
+               .config_intr = marvell_config_intr,
+               .did_interrupt = m88e1121_did_interrupt,
+               .resume = genphy_resume,
+               .suspend = genphy_suspend,
                .read_page = marvell_read_page,
                .write_page = marvell_write_page,
                .get_sset_count = marvell_get_sset_count,