Skip to content

Commit a4307c0

Browse files
hkallweitdavem330
hkallweit
authored and
davem330
committed
net: phy: remove flag PHY_HAS_INTERRUPT from driver configs
Now that flag PHY_HAS_INTERRUPT has been replaced with a check for callbacks config_intr and ack_interrupt, we can remove setting this flag from all driver configs. Last but not least remove flag PHY_HAS_INTERRUPT completely. Signed-off-by: Heiner Kallweit <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0d2e778 commit a4307c0

29 files changed

+6
-121
lines changed

‎drivers/net/phy/amd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ static struct phy_driver am79c_driver[] = { {
6666
.name = "AM79C874",
6767
.phy_id_mask = 0xfffffff0,
6868
.features = PHY_BASIC_FEATURES,
69-
.flags = PHY_HAS_INTERRUPT,
7069
.config_init = am79c_config_init,
7170
.ack_interrupt = am79c_ack_interrupt,
7271
.config_intr = am79c_config_intr,

‎drivers/net/phy/aquantia.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ static struct phy_driver aquantia_driver[] = {
116116
.phy_id_mask = 0xfffffff0,
117117
.name = "Aquantia AQ1202",
118118
.features = PHY_10GBIT_FULL_FEATURES,
119-
.flags = PHY_HAS_INTERRUPT,
120119
.aneg_done = genphy_c45_aneg_done,
121120
.config_aneg = aquantia_config_aneg,
122121
.config_intr = aquantia_config_intr,
@@ -128,7 +127,6 @@ static struct phy_driver aquantia_driver[] = {
128127
.phy_id_mask = 0xfffffff0,
129128
.name = "Aquantia AQ2104",
130129
.features = PHY_10GBIT_FULL_FEATURES,
131-
.flags = PHY_HAS_INTERRUPT,
132130
.aneg_done = genphy_c45_aneg_done,
133131
.config_aneg = aquantia_config_aneg,
134132
.config_intr = aquantia_config_intr,
@@ -140,7 +138,6 @@ static struct phy_driver aquantia_driver[] = {
140138
.phy_id_mask = 0xfffffff0,
141139
.name = "Aquantia AQR105",
142140
.features = PHY_10GBIT_FULL_FEATURES,
143-
.flags = PHY_HAS_INTERRUPT,
144141
.aneg_done = genphy_c45_aneg_done,
145142
.config_aneg = aquantia_config_aneg,
146143
.config_intr = aquantia_config_intr,
@@ -152,7 +149,6 @@ static struct phy_driver aquantia_driver[] = {
152149
.phy_id_mask = 0xfffffff0,
153150
.name = "Aquantia AQR106",
154151
.features = PHY_10GBIT_FULL_FEATURES,
155-
.flags = PHY_HAS_INTERRUPT,
156152
.aneg_done = genphy_c45_aneg_done,
157153
.config_aneg = aquantia_config_aneg,
158154
.config_intr = aquantia_config_intr,
@@ -164,7 +160,6 @@ static struct phy_driver aquantia_driver[] = {
164160
.phy_id_mask = 0xfffffff0,
165161
.name = "Aquantia AQR107",
166162
.features = PHY_10GBIT_FULL_FEATURES,
167-
.flags = PHY_HAS_INTERRUPT,
168163
.aneg_done = genphy_c45_aneg_done,
169164
.config_aneg = aquantia_config_aneg,
170165
.config_intr = aquantia_config_intr,
@@ -176,7 +171,6 @@ static struct phy_driver aquantia_driver[] = {
176171
.phy_id_mask = 0xfffffff0,
177172
.name = "Aquantia AQR405",
178173
.features = PHY_10GBIT_FULL_FEATURES,
179-
.flags = PHY_HAS_INTERRUPT,
180174
.aneg_done = genphy_c45_aneg_done,
181175
.config_aneg = aquantia_config_aneg,
182176
.config_intr = aquantia_config_intr,

‎drivers/net/phy/at803x.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ static struct phy_driver at803x_driver[] = {
379379
.suspend = at803x_suspend,
380380
.resume = at803x_resume,
381381
.features = PHY_GBIT_FEATURES,
382-
.flags = PHY_HAS_INTERRUPT,
383382
.ack_interrupt = at803x_ack_interrupt,
384383
.config_intr = at803x_config_intr,
385384
}, {
@@ -395,7 +394,6 @@ static struct phy_driver at803x_driver[] = {
395394
.suspend = at803x_suspend,
396395
.resume = at803x_resume,
397396
.features = PHY_BASIC_FEATURES,
398-
.flags = PHY_HAS_INTERRUPT,
399397
.ack_interrupt = at803x_ack_interrupt,
400398
.config_intr = at803x_config_intr,
401399
}, {
@@ -410,7 +408,6 @@ static struct phy_driver at803x_driver[] = {
410408
.suspend = at803x_suspend,
411409
.resume = at803x_resume,
412410
.features = PHY_GBIT_FEATURES,
413-
.flags = PHY_HAS_INTERRUPT,
414411
.aneg_done = at803x_aneg_done,
415412
.ack_interrupt = &at803x_ack_interrupt,
416413
.config_intr = &at803x_config_intr,

‎drivers/net/phy/bcm63xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static struct phy_driver bcm63xx_driver[] = {
6969
.phy_id_mask = 0xfffffc00,
7070
.name = "Broadcom BCM63XX (1)",
7171
.features = PHY_BASIC_FEATURES,
72-
.flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL,
72+
.flags = PHY_IS_INTERNAL,
7373
.config_init = bcm63xx_config_init,
7474
.ack_interrupt = bcm_phy_ack_intr,
7575
.config_intr = bcm63xx_config_intr,
@@ -78,7 +78,7 @@ static struct phy_driver bcm63xx_driver[] = {
7878
.phy_id = 0x002bdc00,
7979
.phy_id_mask = 0xfffffc00,
8080
.features = PHY_BASIC_FEATURES,
81-
.flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL,
81+
.flags = PHY_IS_INTERNAL,
8282
.config_init = bcm63xx_config_init,
8383
.ack_interrupt = bcm_phy_ack_intr,
8484
.config_intr = bcm63xx_config_intr,

‎drivers/net/phy/bcm87xx.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ static struct phy_driver bcm87xx_driver[] = {
193193
.phy_id = PHY_ID_BCM8706,
194194
.phy_id_mask = 0xffffffff,
195195
.name = "Broadcom BCM8706",
196-
.flags = PHY_HAS_INTERRUPT,
197196
.config_init = bcm87xx_config_init,
198197
.config_aneg = bcm87xx_config_aneg,
199198
.read_status = bcm87xx_read_status,
@@ -205,7 +204,6 @@ static struct phy_driver bcm87xx_driver[] = {
205204
.phy_id = PHY_ID_BCM8727,
206205
.phy_id_mask = 0xffffffff,
207206
.name = "Broadcom BCM8727",
208-
.flags = PHY_HAS_INTERRUPT,
209207
.config_init = bcm87xx_config_init,
210208
.config_aneg = bcm87xx_config_aneg,
211209
.read_status = bcm87xx_read_status,

‎drivers/net/phy/broadcom.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,6 @@ static struct phy_driver broadcom_drivers[] = {
589589
.phy_id_mask = 0xfffffff0,
590590
.name = "Broadcom BCM5411",
591591
.features = PHY_GBIT_FEATURES,
592-
.flags = PHY_HAS_INTERRUPT,
593592
.config_init = bcm54xx_config_init,
594593
.ack_interrupt = bcm_phy_ack_intr,
595594
.config_intr = bcm_phy_config_intr,
@@ -598,7 +597,6 @@ static struct phy_driver broadcom_drivers[] = {
598597
.phy_id_mask = 0xfffffff0,
599598
.name = "Broadcom BCM5421",
600599
.features = PHY_GBIT_FEATURES,
601-
.flags = PHY_HAS_INTERRUPT,
602600
.config_init = bcm54xx_config_init,
603601
.ack_interrupt = bcm_phy_ack_intr,
604602
.config_intr = bcm_phy_config_intr,
@@ -607,7 +605,6 @@ static struct phy_driver broadcom_drivers[] = {
607605
.phy_id_mask = 0xfffffff0,
608606
.name = "Broadcom BCM54210E",
609607
.features = PHY_GBIT_FEATURES,
610-
.flags = PHY_HAS_INTERRUPT,
611608
.config_init = bcm54xx_config_init,
612609
.ack_interrupt = bcm_phy_ack_intr,
613610
.config_intr = bcm_phy_config_intr,
@@ -616,7 +613,6 @@ static struct phy_driver broadcom_drivers[] = {
616613
.phy_id_mask = 0xfffffff0,
617614
.name = "Broadcom BCM5461",
618615
.features = PHY_GBIT_FEATURES,
619-
.flags = PHY_HAS_INTERRUPT,
620616
.config_init = bcm54xx_config_init,
621617
.ack_interrupt = bcm_phy_ack_intr,
622618
.config_intr = bcm_phy_config_intr,
@@ -625,7 +621,6 @@ static struct phy_driver broadcom_drivers[] = {
625621
.phy_id_mask = 0xfffffff0,
626622
.name = "Broadcom BCM54612E",
627623
.features = PHY_GBIT_FEATURES,
628-
.flags = PHY_HAS_INTERRUPT,
629624
.config_init = bcm54xx_config_init,
630625
.ack_interrupt = bcm_phy_ack_intr,
631626
.config_intr = bcm_phy_config_intr,
@@ -634,7 +629,6 @@ static struct phy_driver broadcom_drivers[] = {
634629
.phy_id_mask = 0xfffffff0,
635630
.name = "Broadcom BCM54616S",
636631
.features = PHY_GBIT_FEATURES,
637-
.flags = PHY_HAS_INTERRUPT,
638632
.config_init = bcm54xx_config_init,
639633
.ack_interrupt = bcm_phy_ack_intr,
640634
.config_intr = bcm_phy_config_intr,
@@ -643,7 +637,6 @@ static struct phy_driver broadcom_drivers[] = {
643637
.phy_id_mask = 0xfffffff0,
644638
.name = "Broadcom BCM5464",
645639
.features = PHY_GBIT_FEATURES,
646-
.flags = PHY_HAS_INTERRUPT,
647640
.config_init = bcm54xx_config_init,
648641
.ack_interrupt = bcm_phy_ack_intr,
649642
.config_intr = bcm_phy_config_intr,
@@ -652,7 +645,6 @@ static struct phy_driver broadcom_drivers[] = {
652645
.phy_id_mask = 0xfffffff0,
653646
.name = "Broadcom BCM5481",
654647
.features = PHY_GBIT_FEATURES,
655-
.flags = PHY_HAS_INTERRUPT,
656648
.config_init = bcm54xx_config_init,
657649
.config_aneg = bcm5481_config_aneg,
658650
.ack_interrupt = bcm_phy_ack_intr,
@@ -662,7 +654,6 @@ static struct phy_driver broadcom_drivers[] = {
662654
.phy_id_mask = 0xfffffff0,
663655
.name = "Broadcom BCM54810",
664656
.features = PHY_GBIT_FEATURES,
665-
.flags = PHY_HAS_INTERRUPT,
666657
.config_init = bcm54xx_config_init,
667658
.config_aneg = bcm5481_config_aneg,
668659
.ack_interrupt = bcm_phy_ack_intr,
@@ -672,7 +663,6 @@ static struct phy_driver broadcom_drivers[] = {
672663
.phy_id_mask = 0xfffffff0,
673664
.name = "Broadcom BCM5482",
674665
.features = PHY_GBIT_FEATURES,
675-
.flags = PHY_HAS_INTERRUPT,
676666
.config_init = bcm5482_config_init,
677667
.read_status = bcm5482_read_status,
678668
.ack_interrupt = bcm_phy_ack_intr,
@@ -682,7 +672,6 @@ static struct phy_driver broadcom_drivers[] = {
682672
.phy_id_mask = 0xfffffff0,
683673
.name = "Broadcom BCM50610",
684674
.features = PHY_GBIT_FEATURES,
685-
.flags = PHY_HAS_INTERRUPT,
686675
.config_init = bcm54xx_config_init,
687676
.ack_interrupt = bcm_phy_ack_intr,
688677
.config_intr = bcm_phy_config_intr,
@@ -691,7 +680,6 @@ static struct phy_driver broadcom_drivers[] = {
691680
.phy_id_mask = 0xfffffff0,
692681
.name = "Broadcom BCM50610M",
693682
.features = PHY_GBIT_FEATURES,
694-
.flags = PHY_HAS_INTERRUPT,
695683
.config_init = bcm54xx_config_init,
696684
.ack_interrupt = bcm_phy_ack_intr,
697685
.config_intr = bcm_phy_config_intr,
@@ -700,7 +688,6 @@ static struct phy_driver broadcom_drivers[] = {
700688
.phy_id_mask = 0xfffffff0,
701689
.name = "Broadcom BCM57780",
702690
.features = PHY_GBIT_FEATURES,
703-
.flags = PHY_HAS_INTERRUPT,
704691
.config_init = bcm54xx_config_init,
705692
.ack_interrupt = bcm_phy_ack_intr,
706693
.config_intr = bcm_phy_config_intr,
@@ -709,7 +696,6 @@ static struct phy_driver broadcom_drivers[] = {
709696
.phy_id_mask = 0xfffffff0,
710697
.name = "Broadcom BCMAC131",
711698
.features = PHY_BASIC_FEATURES,
712-
.flags = PHY_HAS_INTERRUPT,
713699
.config_init = brcm_fet_config_init,
714700
.ack_interrupt = brcm_fet_ack_interrupt,
715701
.config_intr = brcm_fet_config_intr,
@@ -718,7 +704,6 @@ static struct phy_driver broadcom_drivers[] = {
718704
.phy_id_mask = 0xfffffff0,
719705
.name = "Broadcom BCM5241",
720706
.features = PHY_BASIC_FEATURES,
721-
.flags = PHY_HAS_INTERRUPT,
722707
.config_init = brcm_fet_config_init,
723708
.ack_interrupt = brcm_fet_ack_interrupt,
724709
.config_intr = brcm_fet_config_intr,
@@ -737,7 +722,6 @@ static struct phy_driver broadcom_drivers[] = {
737722
.phy_id_mask = 0xfffffff0,
738723
.name = "Broadcom BCM89610",
739724
.features = PHY_GBIT_FEATURES,
740-
.flags = PHY_HAS_INTERRUPT,
741725
.config_init = bcm54xx_config_init,
742726
.ack_interrupt = bcm_phy_ack_intr,
743727
.config_intr = bcm_phy_config_intr,

‎drivers/net/phy/cicada.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ static struct phy_driver cis820x_driver[] = {
108108
.name = "Cicada Cis8201",
109109
.phy_id_mask = 0x000ffff0,
110110
.features = PHY_GBIT_FEATURES,
111-
.flags = PHY_HAS_INTERRUPT,
112111
.config_init = &cis820x_config_init,
113112
.ack_interrupt = &cis820x_ack_interrupt,
114113
.config_intr = &cis820x_config_intr,
@@ -117,7 +116,6 @@ static struct phy_driver cis820x_driver[] = {
117116
.name = "Cicada Cis8204",
118117
.phy_id_mask = 0x000fffc0,
119118
.features = PHY_GBIT_FEATURES,
120-
.flags = PHY_HAS_INTERRUPT,
121119
.config_init = &cis820x_config_init,
122120
.ack_interrupt = &cis820x_ack_interrupt,
123121
.config_intr = &cis820x_config_intr,

‎drivers/net/phy/davicom.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ static struct phy_driver dm91xx_driver[] = {
150150
.name = "Davicom DM9161E",
151151
.phy_id_mask = 0x0ffffff0,
152152
.features = PHY_BASIC_FEATURES,
153-
.flags = PHY_HAS_INTERRUPT,
154153
.config_init = dm9161_config_init,
155154
.config_aneg = dm9161_config_aneg,
156155
.ack_interrupt = dm9161_ack_interrupt,
@@ -160,7 +159,6 @@ static struct phy_driver dm91xx_driver[] = {
160159
.name = "Davicom DM9161B/C",
161160
.phy_id_mask = 0x0ffffff0,
162161
.features = PHY_BASIC_FEATURES,
163-
.flags = PHY_HAS_INTERRUPT,
164162
.config_init = dm9161_config_init,
165163
.config_aneg = dm9161_config_aneg,
166164
.ack_interrupt = dm9161_ack_interrupt,
@@ -170,7 +168,6 @@ static struct phy_driver dm91xx_driver[] = {
170168
.name = "Davicom DM9161A",
171169
.phy_id_mask = 0x0ffffff0,
172170
.features = PHY_BASIC_FEATURES,
173-
.flags = PHY_HAS_INTERRUPT,
174171
.config_init = dm9161_config_init,
175172
.config_aneg = dm9161_config_aneg,
176173
.ack_interrupt = dm9161_ack_interrupt,
@@ -180,7 +177,6 @@ static struct phy_driver dm91xx_driver[] = {
180177
.name = "Davicom DM9131",
181178
.phy_id_mask = 0x0ffffff0,
182179
.features = PHY_BASIC_FEATURES,
183-
.flags = PHY_HAS_INTERRUPT,
184180
.ack_interrupt = dm9161_ack_interrupt,
185181
.config_intr = dm9161_config_intr,
186182
} };

‎drivers/net/phy/dp83640.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,6 @@ static struct phy_driver dp83640_driver = {
15211521
.phy_id_mask = 0xfffffff0,
15221522
.name = "NatSemi DP83640",
15231523
.features = PHY_BASIC_FEATURES,
1524-
.flags = PHY_HAS_INTERRUPT,
15251524
.probe = dp83640_probe,
15261525
.remove = dp83640_remove,
15271526
.soft_reset = dp83640_soft_reset,

‎drivers/net/phy/dp83822.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ static struct phy_driver dp83822_driver[] = {
318318
.phy_id_mask = 0xfffffff0,
319319
.name = "TI DP83822",
320320
.features = PHY_BASIC_FEATURES,
321-
.flags = PHY_HAS_INTERRUPT,
322321
.config_init = dp83822_config_init,
323322
.soft_reset = dp83822_phy_reset,
324323
.get_wol = dp83822_get_wol,

‎drivers/net/phy/dp83848.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
108108
.phy_id_mask = 0xfffffff0, \
109109
.name = _name, \
110110
.features = PHY_BASIC_FEATURES, \
111-
.flags = PHY_HAS_INTERRUPT, \
112111
\
113112
.soft_reset = genphy_soft_reset, \
114113
.config_init = _config_init, \

‎drivers/net/phy/dp83867.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ static struct phy_driver dp83867_driver[] = {
334334
.phy_id_mask = 0xfffffff0,
335335
.name = "TI DP83867",
336336
.features = PHY_GBIT_FEATURES,
337-
.flags = PHY_HAS_INTERRUPT,
338337

339338
.config_init = dp83867_config_init,
340339
.soft_reset = dp83867_phy_reset,

‎drivers/net/phy/dp83tc811.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ static struct phy_driver dp83811_driver[] = {
346346
.phy_id_mask = 0xfffffff0,
347347
.name = "TI DP83TC811",
348348
.features = PHY_BASIC_FEATURES,
349-
.flags = PHY_HAS_INTERRUPT,
350349
.config_init = dp83811_config_init,
351350
.config_aneg = dp83811_config_aneg,
352351
.soft_reset = dp83811_phy_reset,

‎drivers/net/phy/icplus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ static struct phy_driver icplus_driver[] = {
234234
.name = "ICPlus IP101A/G",
235235
.phy_id_mask = 0x0ffffff0,
236236
.features = PHY_BASIC_FEATURES,
237-
.flags = PHY_HAS_INTERRUPT,
238237
.ack_interrupt = ip101a_g_ack_interrupt,
239238
.config_init = &ip101a_g_config_init,
240239
.suspend = genphy_suspend,

0 commit comments

Comments
 (0)