From: David Daney <[email protected]>
This function is only referenced from within phy_device.c, so there is
no reason to export it. In fact, we can make it static.
Signed-off-by: David Daney <[email protected]>
---
drivers/net/phy/phy_device.c | 3 +--
include/linux/phy.h | 1 -
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index e8c42d6..de86a55 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -207,7 +207,7 @@ static struct phy_device* phy_device_create(struct mii_bus *bus,
* Description: Reads the ID registers of the PHY at @addr on the
* @bus, stores it in @phy_id and returns zero on success.
*/
-int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
+static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
{
int phy_reg;
@@ -230,7 +230,6 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
return 0;
}
-EXPORT_SYMBOL(get_phy_id);
/**
* get_phy_device - reads the specified PHY device and returns its @phy_device struct
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 6fe0a37..9039009 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -477,7 +477,6 @@ static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
}
-int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);
struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
int phy_device_register(struct phy_device *phy);
int phy_init_hw(struct phy_device *phydev);
--
1.7.2.3
[[PATCH] netdev/phy: Make get_phy_id() static and quit EXPORTing it.] On 15/05/2012 (Tue 13:46) David Daney wrote:
> From: David Daney <[email protected]>
>
> This function is only referenced from within phy_device.c, so there is
> no reason to export it. In fact, we can make it static.
I did a bit of data mining to remind myself why it was exported. Back
in a01b3d766c (v2.6.26) gianfar_mii was using it. That then got merged
into fsl_pq_mdio.c and gianfar_mii was deleted. Then finally in commit
28d8ea2d568 (v3.2) the one instance of code that was using it got
removed. So, I think this should be OK (but for net-next, though).
Acked-by: Paul Gortmaker <[email protected]>
Paul.
--
>
> Signed-off-by: David Daney <[email protected]>
> ---
> drivers/net/phy/phy_device.c | 3 +--
> include/linux/phy.h | 1 -
> 2 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index e8c42d6..de86a55 100644
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -207,7 +207,7 @@ static struct phy_device* phy_device_create(struct mii_bus *bus,
> * Description: Reads the ID registers of the PHY at @addr on the
> * @bus, stores it in @phy_id and returns zero on success.
> */
> -int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
> +static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
> {
> int phy_reg;
>
> @@ -230,7 +230,6 @@ int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
>
> return 0;
> }
> -EXPORT_SYMBOL(get_phy_id);
>
> /**
> * get_phy_device - reads the specified PHY device and returns its @phy_device struct
> diff --git a/include/linux/phy.h b/include/linux/phy.h
> index 6fe0a37..9039009 100644
> --- a/include/linux/phy.h
> +++ b/include/linux/phy.h
> @@ -477,7 +477,6 @@ static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val)
> return mdiobus_write(phydev->bus, phydev->addr, regnum, val);
> }
>
> -int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);
> struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
> int phy_device_register(struct phy_device *phy);
> int phy_init_hw(struct phy_device *phydev);
> --
> 1.7.2.3
>
From: Paul Gortmaker <[email protected]>
Date: Tue, 15 May 2012 17:32:08 -0400
> [[PATCH] netdev/phy: Make get_phy_id() static and quit EXPORTing it.] On 15/05/2012 (Tue 13:46) David Daney wrote:
>
>> From: David Daney <[email protected]>
>>
>> This function is only referenced from within phy_device.c, so there is
>> no reason to export it. In fact, we can make it static.
>
> I did a bit of data mining to remind myself why it was exported. Back
> in a01b3d766c (v2.6.26) gianfar_mii was using it. That then got merged
> into fsl_pq_mdio.c and gianfar_mii was deleted. Then finally in commit
> 28d8ea2d568 (v3.2) the one instance of code that was using it got
> removed. So, I think this should be OK (but for net-next, though).
>
> Acked-by: Paul Gortmaker <[email protected]>
Applied.