mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 17:57:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: constify phydev->drv

Browse Source 
Device driver structures are shared between all devices that they
match, and thus nothing should never write to the device driver
structure through the phydev->drv pointer. Let's make this pointer
const to catch code that attempts to do so.

Suggested-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1rVxXt-002YqY-9G@rmk-PC.armlinux.org.uk
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Russell King (Oracle)
2024-02-02 17:41:45 +00:00
committed by Paolo Abeni
parent 03ba6dc035
commit 0bd199fd9c
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/phy/phy.c
View File

@@ -1290,7 +1290,6 @@ int phy_disable_interrupts(struct phy_device *phydev)
static irqreturn_t phy_interrupt(int irq, void *phy_dat) static irqreturn_t phy_interrupt(int irq, void *phy_dat)
{ {
struct phy_device *phydev = phy_dat; struct phy_device *phydev = phy_dat;
struct phy_driver *drv = phydev->drv;
irqreturn_t ret; irqreturn_t ret;
/* Wakeup interrupts may occur during a system sleep transition. /* Wakeup interrupts may occur during a system sleep transition.
@@ -1316,7 +1315,7 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat)
} }
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
ret = drv->handle_interrupt(phydev); ret = phydev->drv->handle_interrupt(phydev);
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
return ret; return ret;

6
drivers/net/phy/phy_device.c
View File

@@ -1413,7 +1413,7 @@ int phy_sfp_probe(struct phy_device *phydev,
} }
EXPORT_SYMBOL(phy_sfp_probe); EXPORT_SYMBOL(phy_sfp_probe);
static bool phy_drv_supports_irq(struct phy_driver *phydrv) static bool phy_drv_supports_irq(const struct phy_driver *phydrv)
{ {
return phydrv->config_intr && phydrv->handle_interrupt; return phydrv->config_intr && phydrv->handle_interrupt;
} }
@@ -1867,7 +1867,7 @@ int phy_suspend(struct phy_device *phydev)
{ {
struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL }; struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
struct net_device *netdev = phydev->attached_dev; struct net_device *netdev = phydev->attached_dev;
struct phy_driver *phydrv = phydev->drv; const struct phy_driver *phydrv = phydev->drv;
int ret; int ret;
if (phydev->suspended) if (phydev->suspended)
@@ -1892,7 +1892,7 @@ EXPORT_SYMBOL(phy_suspend);
int __phy_resume(struct phy_device *phydev) int __phy_resume(struct phy_device *phydev)
{ {
struct phy_driver *phydrv = phydev->drv; const struct phy_driver *phydrv = phydev->drv;
int ret; int ret;
lockdep_assert_held(&phydev->lock); lockdep_assert_held(&phydev->lock);

2
drivers/net/phy/xilinx_gmii2rgmii.c
View File

@@ -22,7 +22,7 @@
struct gmii2rgmii { struct gmii2rgmii {
struct phy_device *phy_dev; struct phy_device *phy_dev;
struct phy_driver *phy_drv; const struct phy_driver *phy_drv;
struct phy_driver conv_phy_drv; struct phy_driver conv_phy_drv;
struct mdio_device *mdio; struct mdio_device *mdio;
}; };

2
include/linux/phy.h
View File

@@ -638,7 +638,7 @@ struct phy_device {
/* Information about the PHY type */ /* Information about the PHY type */
/* And management functions */ /* And management functions */
struct phy_driver *drv; const struct phy_driver *drv;
struct device_link *devlink; struct device_link *devlink;