diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2020-01-20 22:16:07 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-21 10:50:41 +0100 |
| commit | 3231e5d2228a2078ce5982d63ea9a617e4972c00 (patch) | |
| tree | 0f05c99b7a861827b6be09ff4da6d9693825cd58 /drivers/net/phy/phy.c | |
| parent | net: hns3: replace snprintf with scnprintf in hns3_update_strings (diff) | |
| download | linux-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 '')
| -rw-r--r-- | drivers/net/phy/phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index da05b3480abb..cf25fa3be123 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -433,19 +433,19 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd) EXPORT_SYMBOL(phy_mii_ioctl); /** - * phy_do_ioctl - generic ndo_do_ioctl implementation + * phy_do_ioctl_running - generic ndo_do_ioctl implementation * @dev: the net_device struct * @ifr: &struct ifreq for socket ioctl's * @cmd: ioctl cmd to execute */ -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) { if (!netif_running(dev) || !dev->phydev) return -ENODEV; return phy_mii_ioctl(dev->phydev, ifr, cmd); } -EXPORT_SYMBOL(phy_do_ioctl); +EXPORT_SYMBOL(phy_do_ioctl_running); void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies) { |