File tree Expand file tree Collapse file tree 6 files changed +0
-797
lines changed Expand file tree Collapse file tree 6 files changed +0
-797
lines changed Original file line number Diff line number Diff line change @@ -318,15 +318,6 @@ static inline bool dsa_port_is_vlan_filtering(const struct dsa_port *dp)
318
318
typedef int dsa_fdb_dump_cb_t (const unsigned char * addr , u16 vid ,
319
319
bool is_static , void * data );
320
320
struct dsa_switch_ops {
321
- #if IS_ENABLED (CONFIG_NET_DSA_LEGACY )
322
- /*
323
- * Legacy probing.
324
- */
325
- const char * (* probe )(struct device * dsa_dev ,
326
- struct device * host_dev , int sw_addr ,
327
- void * * priv );
328
- #endif
329
-
330
321
enum dsa_tag_protocol (* get_tag_protocol )(struct dsa_switch * ds ,
331
322
int port );
332
323
@@ -516,20 +507,6 @@ struct dsa_switch_driver {
516
507
const struct dsa_switch_ops * ops ;
517
508
};
518
509
519
- #if IS_ENABLED (CONFIG_NET_DSA_LEGACY )
520
- /* Legacy driver registration */
521
- void register_switch_driver (struct dsa_switch_driver * type );
522
- void unregister_switch_driver (struct dsa_switch_driver * type );
523
- struct mii_bus * dsa_host_dev_to_mii_bus (struct device * dev );
524
-
525
- #else
526
- static inline void register_switch_driver (struct dsa_switch_driver * type ) { }
527
- static inline void unregister_switch_driver (struct dsa_switch_driver * type ) { }
528
- static inline struct mii_bus * dsa_host_dev_to_mii_bus (struct device * dev )
529
- {
530
- return NULL ;
531
- }
532
- #endif
533
510
struct net_device * dsa_dev_to_net_device (struct device * dev );
534
511
535
512
/* Keep inline for faster access in hot path */
Original file line number Diff line number Diff line change @@ -17,15 +17,6 @@ menuconfig NET_DSA
17
17
18
18
if NET_DSA
19
19
20
- config NET_DSA_LEGACY
21
- bool "Support for older platform device and Device Tree registration"
22
- default y
23
- ---help---
24
- Say Y if you want to enable support for the older platform device and
25
- deprecated Device Tree binding registration.
26
-
27
- This feature is scheduled for removal in 4.17.
28
-
29
20
config NET_DSA_TAG_BRCM_COMMON
30
21
tristate
31
22
default n
Original file line number Diff line number Diff line change 2
2
# the core
3
3
obj-$(CONFIG_NET_DSA) += dsa_core.o
4
4
dsa_core-y += dsa.o dsa2.o master.o port.o slave.o switch.o
5
- dsa_core-$(CONFIG_NET_DSA_LEGACY) += legacy.o
6
5
7
6
# tagging formats
8
7
obj-$(CONFIG_NET_DSA_TAG_BRCM_COMMON) += tag_brcm.o
Original file line number Diff line number Diff line change @@ -346,10 +346,6 @@ static int __init dsa_init_module(void)
346
346
if (rc )
347
347
return rc ;
348
348
349
- rc = dsa_legacy_register ();
350
- if (rc )
351
- return rc ;
352
-
353
349
dev_add_pack (& dsa_pack_type );
354
350
355
351
dsa_tag_driver_register (& DSA_TAG_DRIVER_NAME (none_ops ),
@@ -365,7 +361,6 @@ static void __exit dsa_cleanup_module(void)
365
361
366
362
dsa_slave_unregister_notifier ();
367
363
dev_remove_pack (& dsa_pack_type );
368
- dsa_legacy_unregister ();
369
364
destroy_workqueue (dsa_owq );
370
365
}
371
366
module_exit (dsa_cleanup_module );
Original file line number Diff line number Diff line change @@ -90,18 +90,6 @@ void dsa_tag_driver_put(const struct dsa_device_ops *ops);
90
90
bool dsa_schedule_work (struct work_struct * work );
91
91
const char * dsa_tag_protocol_to_str (const struct dsa_device_ops * ops );
92
92
93
- /* legacy.c */
94
- #if IS_ENABLED (CONFIG_NET_DSA_LEGACY )
95
- int dsa_legacy_register (void );
96
- void dsa_legacy_unregister (void );
97
- #else
98
- static inline int dsa_legacy_register (void )
99
- {
100
- return 0 ;
101
- }
102
-
103
- static inline void dsa_legacy_unregister (void ) { }
104
- #endif
105
93
int dsa_legacy_fdb_add (struct ndmsg * ndm , struct nlattr * tb [],
106
94
struct net_device * dev ,
107
95
const unsigned char * addr , u16 vid ,
You can’t perform that action at this time.
0 commit comments