net: phy: ensure that phy IDs are correctly typed
Subsystems (3)
PATCH v2 1/1 net: phy: ensure that phy IDs are correctly typed
PHY IDs are 32-bit unsigned quantities. Ensure that they are always treated as such, and not passed around as "int"s.
Fixes 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver module")
Signed-off-by Russell King <[email protected]>
--- drivers/net/phy/phy_device.c | 8 ++++---- include/linux/phy.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/phy/phy_device.c +4 -4
@@ -553,7 +553,7 @@ static const struct device_type mdio_bus_phy_type = { .pm = MDIO_BUS_PHY_PM_OPS, }; -static int phy_request_driver_module (struct phy_device *dev,int phy_id) +static int phy_request_driver_module (struct phy_device *dev,u32 phy_id) {int ret;
@@ -565,15 +565,15 @@ static int phy_request_driver_module(struct phy_device *dev, int phy_id)* then modprobe isn't available. */ if (IS_ENABLED (CONFIG_MODULES ) && ret <0 && ret != -ENOENT ) { -phydev_err (dev,"error %d loading PHY driver module for ID 0x%08x\n" , - ret, phy_id); +phydev_err (dev,"error %d loading PHY driver module for ID 0x%08lx\n" , + ret, (unsigned long )phy_id);return ret; }return 0 ; } -struct phy_device *phy_device_create (struct mii_bus *bus,int addr,int phy_id, +struct phy_device *phy_device_create (struct mii_bus *bus,int addr,u32 phy_id,bool is_c45,struct phy_c45_device_ids *c45_ids) {
include/linux/phy.h +1 -1
@@ -1000,7 +1000,7 @@ int phy_modify_paged_changed(struct phy_device *phydev, int page, u32 regnum,int phy_modify_paged (struct phy_device *phydev,int page,u32 regnum,u16 mask,u16 set); -struct phy_device *phy_device_create (struct mii_bus *bus,int addr,int phy_id, +struct phy_device *phy_device_create (struct mii_bus *bus,int addr,u32 phy_id,bool is_c45,struct phy_c45_device_ids *c45_ids);#if IS_ENABLED (CONFIG_PHYLIB )
Signature · 1 line
2.20.1
Quoted 5 lines · Russell King
PHY IDs are 32-bit unsigned quantities. Ensure that they are always treated as such, and not passed around as "int"s.
Fixes 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver module")Signed-off-by Russell King <[email protected]>
Reviewed-by Florian Fainelli <[email protected]>
Signature · 1 line
Florian
Quoted 5 lines · Russell King
PHY IDs are 32-bit unsigned quantities. Ensure that they are always treated as such, and not passed around as "int"s.
Fixes 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver module")Signed-off-by Russell King <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Andrew
David Miller
maintainerFrom: Russell King <[email protected]>
Date: Thu, 19 Dec 2019 23:24:52 +0000
Quoted 5 lines
PHY IDs are 32-bit unsigned quantities. Ensure that they are always treated as such, and not passed around as "int"s.
Fixes 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver module")Signed-off-by Russell King <[email protected]>
Applied and queued up for -stable.