lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: phy: realtek: register/unregister multiple drivers properly

Browse Source 
Using phy_drivers_register/_unregister functions is proper way to
handle multiple PHY drivers registration. For Realtek PHY drivers
module, it fixes incomplete current error-handlings up and adds
missed unregistration for the RTL8201CP driver.

Signed-off-by: Jongsung Kim <neidhard.kim@lge.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jongsung Kim
2014-06-10 12:50:12 +09:00
committed by David S. Miller
parent 1b72a0fc9c
commit 71b9c4a838
1 changed files with 37 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/phy/realtek.c
View File

@@ -64,8 +64,8 @@ static int rtl8211e_config_intr(struct phy_device *phydev)
return err; return err;
} }
/* RTL8201CP */ static struct phy_driver realtek_drvs[] = {
static struct phy_driver rtl8201cp_driver = { {
.phy_id = 0x00008201, .phy_id = 0x00008201,
.name = "RTL8201CP Ethernet", .name = "RTL8201CP Ethernet",
.phy_id_mask = 0x0000ffff, .phy_id_mask = 0x0000ffff,
@@ -74,10 +74,7 @@ static struct phy_driver rtl8201cp_driver = {
.config_aneg = &genphy_config_aneg, .config_aneg = &genphy_config_aneg,
.read_status = &genphy_read_status, .read_status = &genphy_read_status,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}; }, {
/* RTL8211B */
static struct phy_driver rtl8211b_driver = {
.phy_id = 0x001cc912, .phy_id = 0x001cc912,
.name = "RTL8211B Gigabit Ethernet", .name = "RTL8211B Gigabit Ethernet",
.phy_id_mask = 0x001fffff, .phy_id_mask = 0x001fffff,
@@ -88,10 +85,7 @@ static struct phy_driver rtl8211b_driver = {
.ack_interrupt = &rtl821x_ack_interrupt, .ack_interrupt = &rtl821x_ack_interrupt,
.config_intr = &rtl8211b_config_intr, .config_intr = &rtl8211b_config_intr,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}; }, {
/* RTL8211E */
static struct phy_driver rtl8211e_driver = {
.phy_id = 0x001cc915, .phy_id = 0x001cc915,
.name = "RTL8211E Gigabit Ethernet", .name = "RTL8211E Gigabit Ethernet",
.phy_id_mask = 0x001fffff, .phy_id_mask = 0x001fffff,
@@ -104,25 +98,17 @@ static struct phy_driver rtl8211e_driver = {
.suspend = genphy_suspend, .suspend = genphy_suspend,
.resume = genphy_resume, .resume = genphy_resume,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
},
}; };
static int __init realtek_init(void) static int __init realtek_init(void)
{ {
int ret; return phy_drivers_register(realtek_drvs, ARRAY_SIZE(realtek_drvs));
ret = phy_driver_register(&rtl8201cp_driver);
if (ret < 0)
return -ENODEV;
ret = phy_driver_register(&rtl8211b_driver);
if (ret < 0)
return -ENODEV;
return phy_driver_register(&rtl8211e_driver);
} }
static void __exit realtek_exit(void) static void __exit realtek_exit(void)
{ {
phy_driver_unregister(&rtl8211b_driver); phy_drivers_unregister(realtek_drvs, ARRAY_SIZE(realtek_drvs));
phy_driver_unregister(&rtl8211e_driver);
} }
module_init(realtek_init); module_init(realtek_init);