Commit 93e86b3b authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: Remove legacy probing support 



Now that all drivers can be probed using more traditional methods,
remove the legacy probe code.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f8e7ece

include/net/dsa.h

+0 −23
Original line number Diff line number Diff line
@@ -318,15 +318,6 @@ static inline bool dsa_port_is_vlan_filtering(const struct dsa_port *dp) 
typedef int dsa_fdb_dump_cb_t(const unsigned char *addr, u16 vid,

			      bool is_static, void *data);

struct dsa_switch_ops {

#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)

	/*

	 * Legacy probing.

	 */

	const char	*(*probe)(struct device *dsa_dev,

				  struct device *host_dev, int sw_addr,

				  void **priv);

#endif



	enum dsa_tag_protocol (*get_tag_protocol)(struct dsa_switch *ds,

						  int port);
@@ -516,20 +507,6 @@ struct dsa_switch_driver { 
	const struct dsa_switch_ops *ops;

};



#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)

/* Legacy driver registration */

void register_switch_driver(struct dsa_switch_driver *type);

void unregister_switch_driver(struct dsa_switch_driver *type);

struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev);



#else

static inline void register_switch_driver(struct dsa_switch_driver *type) { }

static inline void unregister_switch_driver(struct dsa_switch_driver *type) { }

static inline struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev)

{

	return NULL;

}

#endif

struct net_device *dsa_dev_to_net_device(struct device *dev);



/* Keep inline for faster access in hot path */

net/dsa/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -17,15 +17,6 @@ menuconfig NET_DSA 


if NET_DSA



config NET_DSA_LEGACY

	bool "Support for older platform device and Device Tree registration"

	default y

	---help---

	  Say Y if you want to enable support for the older platform device and

	  deprecated Device Tree binding registration.



	  This feature is scheduled for removal in 4.17.



config NET_DSA_TAG_BRCM_COMMON

	tristate

	default n

net/dsa/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# the core

obj-$(CONFIG_NET_DSA) += dsa_core.o

dsa_core-y += dsa.o dsa2.o master.o port.o slave.o switch.o

dsa_core-$(CONFIG_NET_DSA_LEGACY) += legacy.o



# tagging formats

obj-$(CONFIG_NET_DSA_TAG_BRCM_COMMON) += tag_brcm.o

net/dsa/dsa.c

+0 −5
Original line number Diff line number Diff line
@@ -346,10 +346,6 @@ static int __init dsa_init_module(void) 
	if (rc)

		return rc;



	rc = dsa_legacy_register();

	if (rc)

		return rc;



	dev_add_pack(&dsa_pack_type);



	dsa_tag_driver_register(&DSA_TAG_DRIVER_NAME(none_ops),
@@ -365,7 +361,6 @@ static void __exit dsa_cleanup_module(void) 


	dsa_slave_unregister_notifier();

	dev_remove_pack(&dsa_pack_type);

	dsa_legacy_unregister();

	destroy_workqueue(dsa_owq);

}

module_exit(dsa_cleanup_module);

net/dsa/dsa_priv.h

+0 −12
Original line number Diff line number Diff line
@@ -90,18 +90,6 @@ void dsa_tag_driver_put(const struct dsa_device_ops *ops); 
bool dsa_schedule_work(struct work_struct *work);

const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops);



/* legacy.c */

#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)

int dsa_legacy_register(void);

void dsa_legacy_unregister(void);

#else

static inline int dsa_legacy_register(void)

{

	return 0;

}



static inline void dsa_legacy_unregister(void) { }

#endif

int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],

		       struct net_device *dev,

		       const unsigned char *addr, u16 vid,