[PATCH] net: phy: Directly use ida_alloc()/free()

keliu posted 1 patch 3 years, 11 months ago
There is a newer version of this series
drivers/net/phy/fixed_phy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] net: phy: Directly use ida_alloc()/free()
Posted by keliu 3 years, 11 months ago
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .

Signed-off-by: keliu <liuke94@huawei.com>
---
 drivers/net/phy/fixed_phy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index c65fb5f5d2dc..63e7922bf257 100644
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -180,7 +180,7 @@ static void fixed_phy_del(int phy_addr)
 			if (fp->link_gpiod)
 				gpiod_put(fp->link_gpiod);
 			kfree(fp);
-			ida_simple_remove(&phy_fixed_ida, phy_addr);
+			ida_free(&phy_fixed_ida, phy_addr);
 			return;
 		}
 	}
@@ -250,7 +250,7 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,
 
 	ret = fixed_phy_add_gpiod(irq, phy_addr, status, gpiod);
 	if (ret < 0) {
-		ida_simple_remove(&phy_fixed_ida, phy_addr);
+		ida_free(&phy_fixed_ida, phy_addr);
 		return ERR_PTR(ret);
 	}
 
-- 
2.25.1
Re: [PATCH] net: phy: Directly use ida_alloc()/free()
Posted by Christophe JAILLET 3 years, 11 months ago
Hi,

Le 27/05/2022 à 09:40, keliu a écrit :
> Use ida_alloc()/ida_free() instead of deprecated
> ida_simple_get()/ida_simple_remove() .
> 
> Signed-off-by: keliu <liuke94@huawei.com>
> ---
>   drivers/net/phy/fixed_phy.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
> index c65fb5f5d2dc..63e7922bf257 100644
> --- a/drivers/net/phy/fixed_phy.c
> +++ b/drivers/net/phy/fixed_phy.c
> @@ -180,7 +180,7 @@ static void fixed_phy_del(int phy_addr)
>   			if (fp->link_gpiod)
>   				gpiod_put(fp->link_gpiod);
>   			kfree(fp);
> -			ida_simple_remove(&phy_fixed_ida, phy_addr);
> +			ida_free(&phy_fixed_ida, phy_addr);
>   			return;
>   		}
>   	}
> @@ -250,7 +250,7 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,
>   
>   	ret = fixed_phy_add_gpiod(irq, phy_addr, status, gpiod);
>   	if (ret < 0) {
> -		ida_simple_remove(&phy_fixed_ida, phy_addr);
> +		ida_free(&phy_fixed_ida, phy_addr);
>   		return ERR_PTR(ret);
>   	}
>   

Hi,

You missed ida_simple_get() that shoud become ida_alloc_max() here.

CJ