[PATCH] net: phy: micrel: Fix incorret variable type in micrel

[PATCH] net: phy: micrel: Fix incorret variable type in micrel

[Wan Jiabing]

In lanphy_read_page_reg, calling __phy_read() might return a negative
error code. Use 'int' to check the negative error code.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 drivers/net/phy/micrel.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index a06661c07ca8..c34a93403d1e 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -1959,7 +1959,7 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev,
 
 static int lanphy_read_page_reg(struct phy_device *phydev, int page, u32 addr)
 {
-	u32 data;
+	int data;
 
 	phy_lock_mdio_bus(phydev);
 	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page);
@@ -2660,8 +2660,7 @@ static int lan8804_config_init(struct phy_device *phydev)
 
 static irqreturn_t lan8814_handle_interrupt(struct phy_device *phydev)
 {
-	u16 tsu_irq_status;
-	int irq_status;
+	int irq_status, tsu_irq_status;
 
 	irq_status = phy_read(phydev, LAN8814_INTS);
 	if (irq_status > 0 && (irq_status & LAN8814_INT_LINK))
-- 
2.36.0

Re: [PATCH] net: phy: micrel: Fix incorret variable type in micrel

[Andrew Lunn]

On Mon, May 09, 2022 at 09:49:51PM +0800, Wan Jiabing wrote:
> In lanphy_read_page_reg, calling __phy_read() might return a negative
> error code. Use 'int' to check the negative error code.

Hi Wan

As far as the code goes, this looks good.

Please could you add a Fixes: tag, to indicate where the problem was
introduced. Please also read the netdev FAQ, so you can correctly set
the patch subject. This should be against the net tree, since it is a
fix.

Thanks
	Andrew

Re: [PATCH] net: phy: micrel: Fix incorret variable type in micrel

[Jiabing Wan]

Hi, Andrew

On 2022/5/9 21:53, Andrew Lunn wrote:
> On Mon, May 09, 2022 at 09:49:51PM +0800, Wan Jiabing wrote:
>> In lanphy_read_page_reg, calling __phy_read() might return a negative
>> error code. Use 'int' to check the negative error code.
> Hi Wan
>
> As far as the code goes, this looks good.
>
> Please could you add a Fixes: tag, to indicate where the problem was
> introduced. Please also read the netdev FAQ, so you can correctly set
> the patch subject. This should be against the net tree, since it is a
> fix.
>
> Thanks
> 	Andrew

OK, I'll fix it in v2.

Thanks,
Wan Jiabing

Re: [PATCH] net: phy: micrel: Fix incorret variable type in micrel

[Russell King (Oracle)]

Hi,

Please correct the spelling error of "incorrect" in the subject line.
Thanks.


On Mon, May 09, 2022 at 09:49:51PM +0800, Wan Jiabing wrote:
> In lanphy_read_page_reg, calling __phy_read() might return a negative
> error code. Use 'int' to check the negative error code.
> 
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
> ---
>  drivers/net/phy/micrel.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index a06661c07ca8..c34a93403d1e 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -1959,7 +1959,7 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev,
>  
>  static int lanphy_read_page_reg(struct phy_device *phydev, int page, u32 addr)
>  {
> -	u32 data;
> +	int data;
>  
>  	phy_lock_mdio_bus(phydev);
>  	__phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page);
> @@ -2660,8 +2660,7 @@ static int lan8804_config_init(struct phy_device *phydev)
>  
>  static irqreturn_t lan8814_handle_interrupt(struct phy_device *phydev)
>  {
> -	u16 tsu_irq_status;
> -	int irq_status;
> +	int irq_status, tsu_irq_status;
>  
>  	irq_status = phy_read(phydev, LAN8814_INTS);
>  	if (irq_status > 0 && (irq_status & LAN8814_INT_LINK))
> -- 
> 2.36.0
> 
> 

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!