aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/phy.h
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2020-01-20 22:16:07 +0100
committerDavid S. Miller <davem@davemloft.net>2020-01-21 10:50:41 +0100
commit3231e5d2228a2078ce5982d63ea9a617e4972c00 (patch)
tree0f05c99b7a861827b6be09ff4da6d9693825cd58 /include/linux/phy.h
parentnet: hns3: replace snprintf with scnprintf in hns3_update_strings (diff)
downloadlinux-dev-3231e5d2228a2078ce5982d63ea9a617e4972c00.tar.xz
linux-dev-3231e5d2228a2078ce5982d63ea9a617e4972c00.zip
net: phy: rename phy_do_ioctl to phy_do_ioctl_running
We just added phy_do_ioctl, but it turned out that we need another version of this function that doesn't check whether net_device is running. So rename phy_do_ioctl to phy_do_ioctl_running. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/phy.h')
-rw-r--r--include/linux/phy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h
index be6b3a1b03da..f6e714da37d8 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1242,7 +1242,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev,
int phy_ethtool_ksettings_set(struct phy_device *phydev,
const struct ethtool_link_ksettings *cmd);
int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
-int phy_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
+int phy_do_ioctl_running(struct net_device *dev, struct ifreq *ifr, int cmd);
void phy_request_interrupt(struct phy_device *phydev);
void phy_free_interrupt(struct phy_device *phydev);
void phy_print_status(struct phy_device *phydev);