Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98e67308 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

mv88e6xxx: Combine mv88e6131 and mv88e612_61_65 drivers 



These drivers share a lot of code, so if we make them modular they
should be built into the same module.  Therefore, link them together
and merge their respective module init and exit functions.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7df899c3

net/dsa/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o 
dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o



# switch drivers

obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o

obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o

obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o

obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
 
obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx_drv.o

mv88e6xxx_drv-y += mv88e6xxx.o

mv88e6xxx_drv-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o

mv88e6xxx_drv-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o

net/dsa/mv88e6123_61_65.c

+1 −14
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static int mv88e6123_61_65_get_sset_count(struct dsa_switch *ds) 
	return ARRAY_SIZE(mv88e6123_61_65_hw_stats);

}



static struct dsa_switch_driver mv88e6123_61_65_switch_driver = {

struct dsa_switch_driver mv88e6123_61_65_switch_driver = {

	.tag_protocol		= cpu_to_be16(ETH_P_EDSA),

	.priv_size		= sizeof(struct mv88e6xxx_priv_state),

	.probe			= mv88e6123_61_65_probe,
@@ -432,16 +432,3 @@ static struct dsa_switch_driver mv88e6123_61_65_switch_driver = { 
	.get_ethtool_stats	= mv88e6123_61_65_get_ethtool_stats,

	.get_sset_count		= mv88e6123_61_65_get_sset_count,

};
 


static int __init mv88e6123_61_65_init(void)

{

	register_switch_driver(&mv88e6123_61_65_switch_driver);

	return 0;

}

module_init(mv88e6123_61_65_init);



static void __exit mv88e6123_61_65_cleanup(void)

{

	unregister_switch_driver(&mv88e6123_61_65_switch_driver);

}

module_exit(mv88e6123_61_65_cleanup);

net/dsa/mv88e6131.c

+1 −14
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static int mv88e6131_get_sset_count(struct dsa_switch *ds) 
	return ARRAY_SIZE(mv88e6131_hw_stats);

}



static struct dsa_switch_driver mv88e6131_switch_driver = {

struct dsa_switch_driver mv88e6131_switch_driver = {

	.tag_protocol		= cpu_to_be16(ETH_P_DSA),

	.priv_size		= sizeof(struct mv88e6xxx_priv_state),

	.probe			= mv88e6131_probe,
@@ -428,16 +428,3 @@ static struct dsa_switch_driver mv88e6131_switch_driver = { 
	.get_ethtool_stats	= mv88e6131_get_ethtool_stats,

	.get_sset_count		= mv88e6131_get_sset_count,

};
 


static int __init mv88e6131_init(void)

{

	register_switch_driver(&mv88e6131_switch_driver);

	return 0;

}

module_init(mv88e6131_init);



static void __exit mv88e6131_cleanup(void)

{

	unregister_switch_driver(&mv88e6131_switch_driver);

}

module_exit(mv88e6131_cleanup);

net/dsa/mv88e6xxx.c

+23 −0
Original line number Diff line number Diff line
@@ -520,3 +520,26 @@ void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, 


	mutex_unlock(&ps->stats_mutex);

}



static int __init mv88e6xxx_init(void)

{

#if IS_ENABLED(CONFIG_NET_DSA_MV88E6131)

	register_switch_driver(&mv88e6131_switch_driver);

#endif

#if IS_ENABLED(CONFIG_NET_DSA_MV88E6123_61_65)

	register_switch_driver(&mv88e6123_61_65_switch_driver);

#endif

	return 0;

}

module_init(mv88e6xxx_init);



static void __exit mv88e6xxx_cleanup(void)

{

#if IS_ENABLED(CONFIG_NET_DSA_MV88E6123_61_65)

	unregister_switch_driver(&mv88e6123_61_65_switch_driver);

#endif

#if IS_ENABLED(CONFIG_NET_DSA_MV88E6131)

	unregister_switch_driver(&mv88e6131_switch_driver);

#endif

}

module_exit(mv88e6xxx_cleanup);

net/dsa/mv88e6xxx.h

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, 
				 int nr_stats, struct mv88e6xxx_hw_stat *stats,

				 int port, uint64_t *data);



extern struct dsa_switch_driver mv88e6131_switch_driver;

extern struct dsa_switch_driver mv88e6123_61_65_switch_driver;



#define REG_READ(addr, reg)						\

	({								\

		int __ret;						\