Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

phylib: cleanup marvell.c a bit

Browse source 
Simplify the marvell driver init a bit: Make the supported devices an
array instead of explicitly registering each structure. This makes it
considerably easier to add new devices down the road.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Olof Johansson 2007-07-03 16:23:46 -05:00 • committed by Jeff Garzik
parent 825a2ff189
commit e54792396f
1 changed files with 52 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
drivers/net/phy/marvell.c
View file

@ -254,7 +254,8 @@ static int m88e1145_config_init(struct phy_device *phydev)
return 0; return 0;
} }
static struct phy_driver m88e1101_driver = { static struct phy_driver marvell_drivers[] = {
{
.phy_id = 0x01410c60, .phy_id = 0x01410c60,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Marvell 88E1101", .name = "Marvell 88E1101",
@ -265,23 +266,21 @@ static struct phy_driver m88e1101_driver = {
.ack_interrupt = &marvell_ack_interrupt, .ack_interrupt = &marvell_ack_interrupt,
.config_intr = &marvell_config_intr, .config_intr = &marvell_config_intr,
.driver = {.owner = THIS_MODULE,}, .driver = {.owner = THIS_MODULE,},
}; },
{
static struct phy_driver m88e1111_driver = {
.phy_id = 0x01410cc0, .phy_id = 0x01410cc0,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Marvell 88E1111", .name = "Marvell 88E1111",
.features = PHY_GBIT_FEATURES, .features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_INTERRUPT, .flags = PHY_HAS_INTERRUPT,
.config_init = &m88e1111_config_init,
.config_aneg = &marvell_config_aneg, .config_aneg = &marvell_config_aneg,
.read_status = &genphy_read_status, .read_status = &genphy_read_status,
.ack_interrupt = &marvell_ack_interrupt, .ack_interrupt = &marvell_ack_interrupt,
.config_intr = &marvell_config_intr, .config_intr = &marvell_config_intr,
.config_init = &m88e1111_config_init,
.driver = {.owner = THIS_MODULE,}, .driver = {.owner = THIS_MODULE,},
}; },
{
static struct phy_driver m88e1145_driver = {
.phy_id = 0x01410cd0, .phy_id = 0x01410cd0,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "Marvell 88E1145", .name = "Marvell 88E1145",
@ -293,38 +292,33 @@ static struct phy_driver m88e1145_driver = {
.ack_interrupt = &marvell_ack_interrupt, .ack_interrupt = &marvell_ack_interrupt,
.config_intr = &marvell_config_intr, .config_intr = &marvell_config_intr,
.driver = {.owner = THIS_MODULE,}, .driver = {.owner = THIS_MODULE,},
}
}; };
static int __init marvell_init(void) static int __init marvell_init(void)
{ {
int ret; int ret;
int i;
ret = phy_driver_register(&m88e1101_driver); for (i = 0; i < ARRAY_SIZE(marvell_drivers); i++) {
if (ret) ret = phy_driver_register(&marvell_drivers[i]);
if (ret) {
while (i-- > 0)
phy_driver_unregister(&marvell_drivers[i]);
return ret; return ret;
}
ret = phy_driver_register(&m88e1111_driver); }
if (ret)
goto err1111;
ret = phy_driver_register(&m88e1145_driver);
if (ret)
goto err1145;
return 0; return 0;
err1145:
phy_driver_unregister(&m88e1111_driver);
err1111:
phy_driver_unregister(&m88e1101_driver);
return ret;
} }
static void __exit marvell_exit(void) static void __exit marvell_exit(void)
{ {
phy_driver_unregister(&m88e1101_driver); int i;
phy_driver_unregister(&m88e1111_driver);
phy_driver_unregister(&m88e1145_driver); for (i = 0; i < ARRAY_SIZE(marvell_drivers); i++)
phy_driver_unregister(&marvell_drivers[i]);
} }
module_init(marvell_init); module_init(marvell_init);