usb: gadget: function: Remove usage of the deprecated ida_simple_xx() API

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_max() is inclusive. So a -1 has been added when needed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/7cd361e2b377a5373968fa7deee4169229992a1e.1713107386.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 3c8a9dd585c09ea0bd5d1817ab3aadf60c0537b5..2db01e03bfbf0b5b9d577bb15ce5e27a714202a0 100644 (file)
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -1029,9 +1029,9 @@ static inline int hidg_get_minor(void)
 {
        int ret;
 
-       ret = ida_simple_get(&hidg_ida, 0, 0, GFP_KERNEL);
+       ret = ida_alloc(&hidg_ida, GFP_KERNEL);
        if (ret >= HIDG_MINORS) {
-               ida_simple_remove(&hidg_ida, ret);
+               ida_free(&hidg_ida, ret);
                ret = -ENODEV;
        }
 
@@ -1176,7 +1176,7 @@ static const struct config_item_type hid_func_type = {
 
 static inline void hidg_put_minor(int minor)
 {
-       ida_simple_remove(&hidg_ida, minor);
+       ida_free(&hidg_ida, minor);
 }
 
 static void hidg_free_inst(struct usb_function_instance *f)

diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index 076dd4c1be96c0644871995197044aaebed96f95..ba7d180cc9e6da49066f4431e6358d737de9ba21 100644 (file)
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -1312,9 +1312,9 @@ static inline int gprinter_get_minor(void)
 {
        int ret;
 
-       ret = ida_simple_get(&printer_ida, 0, 0, GFP_KERNEL);
+       ret = ida_alloc(&printer_ida, GFP_KERNEL);
        if (ret >= PRINTER_MINORS) {
-               ida_simple_remove(&printer_ida, ret);
+               ida_free(&printer_ida, ret);
                ret = -ENODEV;
        }
 
@@ -1323,7 +1323,7 @@ static inline int gprinter_get_minor(void)
 
 static inline void gprinter_put_minor(int minor)
 {
-       ida_simple_remove(&printer_ida, minor);
+       ida_free(&printer_ida, minor);
 }
 
 static int gprinter_setup(int);

diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index 29bf8664bf582dfc685a2dca5b8ad21ffcc08ebf..12c5d9cf450c10133139f1cae5f83bc2302e4e30 100644 (file)
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -869,12 +869,12 @@ EXPORT_SYMBOL_GPL(rndis_msg_parser);
 
 static inline int rndis_get_nr(void)
 {
-       return ida_simple_get(&rndis_ida, 0, 1000, GFP_KERNEL);
+       return ida_alloc_max(&rndis_ida, 999, GFP_KERNEL);
 }
 
 static inline void rndis_put_nr(int nr)
 {
-       ida_simple_remove(&rndis_ida, nr);
+       ida_free(&rndis_ida, nr);
 }
 
 struct rndis_params *rndis_register(void (*resp_avail)(void *v), void *v)