Commit d79e26a7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'remove-PHY_HAS_INTERRUPT' 



Heiner Kallweit says:

====================
net: phy: replace PHY_HAS_INTERRUPT with a check for config_intr and ack_interrupt

Flag PHY_HAS_INTERRUPT is used only here for this small check. I think
using interrupts isn't possible if a driver defines neither
config_intr nor ack_interrupts callback. So we can replace checking
flag PHY_HAS_INTERRUPT with checking for these callbacks.
This allows to remove this flag from all driver configs.

v2:
- add helper for check in patch 1
- remove PHY_HAS_INTERRUPT from all drivers, not only Realtek
- remove flag PHY_HAS_INTERRUPT completely

v3:
- rebase patch 2
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e15e067d a4307c0e

drivers/net/phy/amd.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static struct phy_driver am79c_driver[] = { { 
	.name		= "AM79C874",

	.phy_id_mask	= 0xfffffff0,

	.features	= PHY_BASIC_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.config_init	= am79c_config_init,

	.ack_interrupt	= am79c_ack_interrupt,

	.config_intr	= am79c_config_intr,

drivers/net/phy/aquantia.c

+0 −6
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ static struct phy_driver aquantia_driver[] = { 
	.phy_id_mask	= 0xfffffff0,

	.name		= "Aquantia AQ1202",

	.features	= PHY_10GBIT_FULL_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.aneg_done	= genphy_c45_aneg_done,

	.config_aneg    = aquantia_config_aneg,

	.config_intr	= aquantia_config_intr,
@@ -128,7 +127,6 @@ static struct phy_driver aquantia_driver[] = { 
	.phy_id_mask	= 0xfffffff0,

	.name		= "Aquantia AQ2104",

	.features	= PHY_10GBIT_FULL_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.aneg_done	= genphy_c45_aneg_done,

	.config_aneg    = aquantia_config_aneg,

	.config_intr	= aquantia_config_intr,
@@ -140,7 +138,6 @@ static struct phy_driver aquantia_driver[] = { 
	.phy_id_mask	= 0xfffffff0,

	.name		= "Aquantia AQR105",

	.features	= PHY_10GBIT_FULL_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.aneg_done	= genphy_c45_aneg_done,

	.config_aneg    = aquantia_config_aneg,

	.config_intr	= aquantia_config_intr,
@@ -152,7 +149,6 @@ static struct phy_driver aquantia_driver[] = { 
	.phy_id_mask	= 0xfffffff0,

	.name		= "Aquantia AQR106",

	.features	= PHY_10GBIT_FULL_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.aneg_done	= genphy_c45_aneg_done,

	.config_aneg    = aquantia_config_aneg,

	.config_intr	= aquantia_config_intr,
@@ -164,7 +160,6 @@ static struct phy_driver aquantia_driver[] = { 
	.phy_id_mask	= 0xfffffff0,

	.name		= "Aquantia AQR107",

	.features	= PHY_10GBIT_FULL_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.aneg_done	= genphy_c45_aneg_done,

	.config_aneg    = aquantia_config_aneg,

	.config_intr	= aquantia_config_intr,
@@ -176,7 +171,6 @@ static struct phy_driver aquantia_driver[] = { 
	.phy_id_mask	= 0xfffffff0,

	.name		= "Aquantia AQR405",

	.features	= PHY_10GBIT_FULL_FEATURES,

	.flags		= PHY_HAS_INTERRUPT,

	.aneg_done	= genphy_c45_aneg_done,

	.config_aneg    = aquantia_config_aneg,

	.config_intr	= aquantia_config_intr,

drivers/net/phy/at803x.c

+0 −3
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ static struct phy_driver at803x_driver[] = { 
	.suspend		= at803x_suspend,

	.resume			= at803x_resume,

	.features		= PHY_GBIT_FEATURES,

	.flags			= PHY_HAS_INTERRUPT,

	.ack_interrupt		= at803x_ack_interrupt,

	.config_intr		= at803x_config_intr,

}, {
@@ -395,7 +394,6 @@ static struct phy_driver at803x_driver[] = { 
	.suspend		= at803x_suspend,

	.resume			= at803x_resume,

	.features		= PHY_BASIC_FEATURES,

	.flags			= PHY_HAS_INTERRUPT,

	.ack_interrupt		= at803x_ack_interrupt,

	.config_intr		= at803x_config_intr,

}, {
@@ -410,7 +408,6 @@ static struct phy_driver at803x_driver[] = { 
	.suspend		= at803x_suspend,

	.resume			= at803x_resume,

	.features		= PHY_GBIT_FEATURES,

	.flags			= PHY_HAS_INTERRUPT,

	.aneg_done		= at803x_aneg_done,

	.ack_interrupt		= &at803x_ack_interrupt,

	.config_intr		= &at803x_config_intr,

drivers/net/phy/bcm63xx.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static struct phy_driver bcm63xx_driver[] = { 
	.phy_id_mask	= 0xfffffc00,

	.name		= "Broadcom BCM63XX (1)",

	.features	= PHY_BASIC_FEATURES,

	.flags		= PHY_HAS_INTERRUPT | PHY_IS_INTERNAL,

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm63xx_config_init,

	.ack_interrupt	= bcm_phy_ack_intr,

	.config_intr	= bcm63xx_config_intr,
@@ -78,7 +78,7 @@ static struct phy_driver bcm63xx_driver[] = { 
	.phy_id		= 0x002bdc00,

	.phy_id_mask	= 0xfffffc00,

	.features	= PHY_BASIC_FEATURES,

	.flags		= PHY_HAS_INTERRUPT | PHY_IS_INTERNAL,

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm63xx_config_init,

	.ack_interrupt	= bcm_phy_ack_intr,

	.config_intr	= bcm63xx_config_intr,

drivers/net/phy/bcm87xx.c

+0 −2
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ static struct phy_driver bcm87xx_driver[] = { 
	.phy_id		= PHY_ID_BCM8706,

	.phy_id_mask	= 0xffffffff,

	.name		= "Broadcom BCM8706",

	.flags		= PHY_HAS_INTERRUPT,

	.config_init	= bcm87xx_config_init,

	.config_aneg	= bcm87xx_config_aneg,

	.read_status	= bcm87xx_read_status,
@@ -205,7 +204,6 @@ static struct phy_driver bcm87xx_driver[] = { 
	.phy_id		= PHY_ID_BCM8727,

	.phy_id_mask	= 0xffffffff,

	.name		= "Broadcom BCM8727",

	.flags		= PHY_HAS_INTERRUPT,

	.config_init	= bcm87xx_config_init,

	.config_aneg	= bcm87xx_config_aneg,

	.read_status	= bcm87xx_read_status,

CRA Git | Maintained and supported by SUSTech CRA and CCSE