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

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

phy: Centralize setting driver module owner 



Rather than have each driver set the driver owner field, do it once in
the core code. This will also help with later changes, when the device
structure will move.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc87922f

drivers/net/phy/amd.c

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static struct phy_driver am79c_driver[] = { { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= am79c_ack_interrupt,

	.config_intr	= am79c_config_intr,

	.driver		= { .owner = THIS_MODULE,},

} };



module_phy_driver(am79c_driver);

drivers/net/phy/aquantia.c

+0 −4
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static struct phy_driver aquantia_driver[] = { 
	.config_intr	= aquantia_config_intr,

	.ack_interrupt	= aquantia_ack_interrupt,

	.read_status	= aquantia_read_status,

	.driver		= { .owner = THIS_MODULE,},

},

{

	.phy_id		= PHY_ID_AQ2104,
@@ -141,7 +140,6 @@ static struct phy_driver aquantia_driver[] = { 
	.config_intr	= aquantia_config_intr,

	.ack_interrupt	= aquantia_ack_interrupt,

	.read_status	= aquantia_read_status,

	.driver		= { .owner = THIS_MODULE,},

},

{

	.phy_id		= PHY_ID_AQR105,
@@ -154,7 +152,6 @@ static struct phy_driver aquantia_driver[] = { 
	.config_intr	= aquantia_config_intr,

	.ack_interrupt	= aquantia_ack_interrupt,

	.read_status	= aquantia_read_status,

	.driver		= { .owner = THIS_MODULE,},

},

{

	.phy_id		= PHY_ID_AQR405,
@@ -167,7 +164,6 @@ static struct phy_driver aquantia_driver[] = { 
	.config_intr	= aquantia_config_intr,

	.ack_interrupt	= aquantia_ack_interrupt,

	.read_status	= aquantia_read_status,

	.driver		= { .owner = THIS_MODULE,},

},

};

drivers/net/phy/at803x.c

+0 −9
Original line number Diff line number Diff line
@@ -310,9 +310,6 @@ static struct phy_driver at803x_driver[] = { 
	.read_status		= genphy_read_status,

	.ack_interrupt		= at803x_ack_interrupt,

	.config_intr		= at803x_config_intr,

	.driver			= {

		.owner = THIS_MODULE,

	},

}, {

	/* ATHEROS 8030 */

	.phy_id			= ATH8030_PHY_ID,
@@ -331,9 +328,6 @@ static struct phy_driver at803x_driver[] = { 
	.read_status		= genphy_read_status,

	.ack_interrupt		= at803x_ack_interrupt,

	.config_intr		= at803x_config_intr,

	.driver			= {

		.owner = THIS_MODULE,

	},

}, {

	/* ATHEROS 8031 */

	.phy_id			= ATH8031_PHY_ID,
@@ -352,9 +346,6 @@ static struct phy_driver at803x_driver[] = { 
	.read_status		= genphy_read_status,

	.ack_interrupt		= &at803x_ack_interrupt,

	.config_intr		= &at803x_config_intr,

	.driver			= {

		.owner = THIS_MODULE,

	},

} };



module_phy_driver(at803x_driver);

drivers/net/phy/bcm63xx.c

+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static struct phy_driver bcm63xx_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= bcm_phy_ack_intr,

	.config_intr	= bcm_phy_config_intr,

	.driver		= { .owner = THIS_MODULE },

}, {

	/* same phy as above, with just a different OUI */

	.phy_id		= 0x002bdc00,
@@ -69,7 +68,6 @@ static struct phy_driver bcm63xx_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= bcm_phy_ack_intr,

	.config_intr	= bcm_phy_config_intr,

	.driver		= { .owner = THIS_MODULE },

} };



module_phy_driver(bcm63xx_driver);

drivers/net/phy/bcm7xxx.c

+0 −6
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ static int bcm7xxx_dummy_config_init(struct phy_device *phydev) 
	.config_aneg	= genphy_config_aneg,				\

	.read_status	= genphy_read_status,				\

	.resume		= bcm7xxx_28nm_resume,				\

	.driver		= { .owner = THIS_MODULE },			\

}



static struct phy_driver bcm7xxx_driver[] = {
@@ -346,7 +345,6 @@ static struct phy_driver bcm7xxx_driver[] = { 
	.read_status    = genphy_read_status,

	.suspend        = bcm7xxx_suspend,

	.resume         = bcm7xxx_config_init,

	.driver         = { .owner = THIS_MODULE },

}, {

	.phy_id         = PHY_ID_BCM7429,

	.phy_id_mask    = 0xfffffff0,
@@ -359,7 +357,6 @@ static struct phy_driver bcm7xxx_driver[] = { 
	.read_status    = genphy_read_status,

	.suspend        = bcm7xxx_suspend,

	.resume         = bcm7xxx_config_init,

	.driver         = { .owner = THIS_MODULE },

}, {

	.phy_id         = PHY_ID_BCM7435,

	.phy_id_mask    = 0xfffffff0,
@@ -372,7 +369,6 @@ static struct phy_driver bcm7xxx_driver[] = { 
	.read_status    = genphy_read_status,

	.suspend        = bcm7xxx_suspend,

	.resume         = bcm7xxx_config_init,

	.driver         = { .owner = THIS_MODULE },

}, {

	.phy_id		= PHY_BCM_OUI_4,

	.phy_id_mask	= 0xffff0000,
@@ -385,7 +381,6 @@ static struct phy_driver bcm7xxx_driver[] = { 
	.read_status	= genphy_read_status,

	.suspend	= bcm7xxx_suspend,

	.resume		= bcm7xxx_config_init,

	.driver		= { .owner = THIS_MODULE },

}, {

	.phy_id		= PHY_BCM_OUI_5,

	.phy_id_mask	= 0xffffff00,
@@ -398,7 +393,6 @@ static struct phy_driver bcm7xxx_driver[] = { 
	.read_status	= genphy_read_status,

	.suspend	= bcm7xxx_suspend,

	.resume		= bcm7xxx_config_init,

	.driver		= { .owner = THIS_MODULE },

} };



static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = {