diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-11-11 09:37:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-11 09:37:04 -0800 |
| commit | d79e26a7efc22c4cc2cd66529cc3bd4e0ed5938a (patch) | |
| tree | dee28465b4a5bfe7089cb9d6a21910ba71fd54a3 /include/linux/phy.h | |
| parent | sctp: Fix SKB list traversal in sctp_intl_store_ordered(). (diff) | |
| parent | net: phy: remove flag PHY_HAS_INTERRUPT from driver configs (diff) | |
| download | linux-dev-d79e26a7efc22c4cc2cd66529cc3bd4e0ed5938a.tar.xz linux-dev-d79e26a7efc22c4cc2cd66529cc3bd4e0ed5938a.zip | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 3299ec6e69f3..59bb31ee132f 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -66,9 +66,8 @@ extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_10gbit_full_features) __ro_after_ini #define PHY_POLL -1 #define PHY_IGNORE_INTERRUPT -2 -#define PHY_HAS_INTERRUPT 0x00000001 -#define PHY_IS_INTERNAL 0x00000002 -#define PHY_RST_AFTER_CLK_EN 0x00000004 +#define PHY_IS_INTERNAL 0x00000001 +#define PHY_RST_AFTER_CLK_EN 0x00000002 #define MDIO_DEVICE_IS_PHY 0x80000000 /* Interface Mode definitions */ |