Commit 116dffa0 authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller

net: phy: replace phy_driver_register calls

Replace module init/exit which only calls phy_driver_register with
module_phy_driver macro.

Compile tested only.
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c31accd1
...@@ -61,7 +61,7 @@ static int am79c_config_intr(struct phy_device *phydev) ...@@ -61,7 +61,7 @@ static int am79c_config_intr(struct phy_device *phydev)
return err; return err;
} }
static struct phy_driver am79c_driver = { static struct phy_driver am79c_driver[] = { {
.phy_id = PHY_ID_AM79C874, .phy_id = PHY_ID_AM79C874,
.name = "AM79C874", .name = "AM79C874",
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
...@@ -73,20 +73,9 @@ static struct phy_driver am79c_driver = { ...@@ -73,20 +73,9 @@ static struct phy_driver am79c_driver = {
.ack_interrupt = am79c_ack_interrupt, .ack_interrupt = am79c_ack_interrupt,
.config_intr = am79c_config_intr, .config_intr = am79c_config_intr,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}; } };
static int __init am79c_init(void)
{
return phy_driver_register(&am79c_driver);
}
static void __exit am79c_exit(void)
{
phy_driver_unregister(&am79c_driver);
}
module_init(am79c_init); module_phy_driver(am79c_driver);
module_exit(am79c_exit);
static struct mdio_device_id __maybe_unused amd_tbl[] = { static struct mdio_device_id __maybe_unused amd_tbl[] = {
{ PHY_ID_AM79C874, 0xfffffff0 }, { PHY_ID_AM79C874, 0xfffffff0 },
......
...@@ -87,7 +87,7 @@ static int et1011c_read_status(struct phy_device *phydev) ...@@ -87,7 +87,7 @@ static int et1011c_read_status(struct phy_device *phydev)
return ret; return ret;
} }
static struct phy_driver et1011c_driver = { static struct phy_driver et1011c_driver[] = { {
.phy_id = 0x0282f014, .phy_id = 0x0282f014,
.name = "ET1011C", .name = "ET1011C",
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
...@@ -96,20 +96,9 @@ static struct phy_driver et1011c_driver = { ...@@ -96,20 +96,9 @@ static struct phy_driver et1011c_driver = {
.config_aneg = et1011c_config_aneg, .config_aneg = et1011c_config_aneg,
.read_status = et1011c_read_status, .read_status = et1011c_read_status,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}; } };
static int __init et1011c_init(void)
{
return phy_driver_register(&et1011c_driver);
}
static void __exit et1011c_exit(void)
{
phy_driver_unregister(&et1011c_driver);
}
module_init(et1011c_init); module_phy_driver(et1011c_driver);
module_exit(et1011c_exit);
static struct mdio_device_id __maybe_unused et1011c_tbl[] = { static struct mdio_device_id __maybe_unused et1011c_tbl[] = {
{ 0x0282f014, 0xfffffff0 }, { 0x0282f014, 0xfffffff0 },
......
...@@ -129,7 +129,7 @@ static int ns_config_init(struct phy_device *phydev) ...@@ -129,7 +129,7 @@ static int ns_config_init(struct phy_device *phydev)
return ns_ack_interrupt(phydev); return ns_ack_interrupt(phydev);
} }
static struct phy_driver dp83865_driver = { static struct phy_driver dp83865_driver[] = { {
.phy_id = DP83865_PHY_ID, .phy_id = DP83865_PHY_ID,
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
.name = "NatSemi DP83865", .name = "NatSemi DP83865",
...@@ -141,25 +141,14 @@ static struct phy_driver dp83865_driver = { ...@@ -141,25 +141,14 @@ static struct phy_driver dp83865_driver = {
.ack_interrupt = ns_ack_interrupt, .ack_interrupt = ns_ack_interrupt,
.config_intr = ns_config_intr, .config_intr = ns_config_intr,
.driver = {.owner = THIS_MODULE,} .driver = {.owner = THIS_MODULE,}
}; } };
static int __init ns_init(void) module_phy_driver(dp83865_driver);
{
return phy_driver_register(&dp83865_driver);
}
static void __exit ns_exit(void)
{
phy_driver_unregister(&dp83865_driver);
}
MODULE_DESCRIPTION("NatSemi PHY driver"); MODULE_DESCRIPTION("NatSemi PHY driver");
MODULE_AUTHOR("Stuart Menefy"); MODULE_AUTHOR("Stuart Menefy");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_init(ns_init);
module_exit(ns_exit);
static struct mdio_device_id __maybe_unused ns_tbl[] = { static struct mdio_device_id __maybe_unused ns_tbl[] = {
{ DP83865_PHY_ID, 0xfffffff0 }, { DP83865_PHY_ID, 0xfffffff0 },
{ } { }
......
...@@ -111,7 +111,7 @@ static int qs6612_config_intr(struct phy_device *phydev) ...@@ -111,7 +111,7 @@ static int qs6612_config_intr(struct phy_device *phydev)
} }
static struct phy_driver qs6612_driver = { static struct phy_driver qs6612_driver[] = { {
.phy_id = 0x00181440, .phy_id = 0x00181440,
.name = "QS6612", .name = "QS6612",
.phy_id_mask = 0xfffffff0, .phy_id_mask = 0xfffffff0,
...@@ -123,20 +123,9 @@ static struct phy_driver qs6612_driver = { ...@@ -123,20 +123,9 @@ static struct phy_driver qs6612_driver = {
.ack_interrupt = qs6612_ack_interrupt, .ack_interrupt = qs6612_ack_interrupt,
.config_intr = qs6612_config_intr, .config_intr = qs6612_config_intr,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}; } };
static int __init qs6612_init(void)
{
return phy_driver_register(&qs6612_driver);
}
static void __exit qs6612_exit(void)
{
phy_driver_unregister(&qs6612_driver);
}
module_init(qs6612_init); module_phy_driver(qs6612_driver);
module_exit(qs6612_exit);
static struct mdio_device_id __maybe_unused qs6612_tbl[] = { static struct mdio_device_id __maybe_unused qs6612_tbl[] = {
{ 0x00181440, 0xfffffff0 }, { 0x00181440, 0xfffffff0 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment