mux: Remove usage of the deprecated ida_simple_xx() API

Message ID 727714bdfcd69d21e7f2a0c5c7426fcb70439b91.1702228605.git.christophe.jaillet@wanadoo.fr
State New
Headers
Series mux: Remove usage of the deprecated ida_simple_xx() API |

Commit Message

Christophe JAILLET Dec. 10, 2023, 5:17 p.m. UTC
  ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

This is less verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/mux/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Christophe JAILLET Feb. 8, 2024, 5:57 p.m. UTC | #1
Le 10/12/2023 à 18:17, Christophe JAILLET a écrit :
> ida_alloc() and ida_free() should be preferred to the deprecated
> ida_simple_get() and ida_simple_remove().
> 
> This is less verbose.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>   drivers/mux/core.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mux/core.c b/drivers/mux/core.c
> index 775816112932..78c0022697ec 100644
> --- a/drivers/mux/core.c
> +++ b/drivers/mux/core.c
> @@ -64,7 +64,7 @@ static void mux_chip_release(struct device *dev)
>   {
>   	struct mux_chip *mux_chip = to_mux_chip(dev);
>   
> -	ida_simple_remove(&mux_ida, mux_chip->id);
> +	ida_free(&mux_ida, mux_chip->id);
>   	kfree(mux_chip);
>   }
>   
> @@ -111,7 +111,7 @@ struct mux_chip *mux_chip_alloc(struct device *dev,
>   	mux_chip->dev.of_node = dev->of_node;
>   	dev_set_drvdata(&mux_chip->dev, mux_chip);
>   
> -	mux_chip->id = ida_simple_get(&mux_ida, 0, 0, GFP_KERNEL);
> +	mux_chip->id = ida_alloc(&mux_ida, GFP_KERNEL);
>   	if (mux_chip->id < 0) {
>   		int err = mux_chip->id;
>   

Hi,

gentle reminder.

All patches to remove the ida_simple API have been sent.
And Matthew Wilcox seems happy with the on going work. (see [1])

Based on next-20240207
$git grep ida_simple_get | wc -l
38

https://elixir.bootlin.com/linux/v6.8-rc3/A/ident/ida_simple_get
50

https://elixir.bootlin.com/linux/v6.7.4/A/ident/ida_simple_get
81

Thanks
CJ

[1]: https://lore.kernel.org/all/ZaqruGVz734zjxrZ@casper.infradead.org/
  

Patch

diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 775816112932..78c0022697ec 100644
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -64,7 +64,7 @@  static void mux_chip_release(struct device *dev)
 {
 	struct mux_chip *mux_chip = to_mux_chip(dev);
 
-	ida_simple_remove(&mux_ida, mux_chip->id);
+	ida_free(&mux_ida, mux_chip->id);
 	kfree(mux_chip);
 }
 
@@ -111,7 +111,7 @@  struct mux_chip *mux_chip_alloc(struct device *dev,
 	mux_chip->dev.of_node = dev->of_node;
 	dev_set_drvdata(&mux_chip->dev, mux_chip);
 
-	mux_chip->id = ida_simple_get(&mux_ida, 0, 0, GFP_KERNEL);
+	mux_chip->id = ida_alloc(&mux_ida, GFP_KERNEL);
 	if (mux_chip->id < 0) {
 		int err = mux_chip->id;