drivers: usb: Directly use ida_alloc()/free()
Subsystems (3)
PATCH 1/1 drivers: usb: Directly use ida_alloc()/free()
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Signed-off-by keliu <[email protected]>
--- drivers/usb/chipidea/core.c | 6 +++--- drivers/usb/gadget/function/f_hid.c | 6 +++--- drivers/usb/gadget/function/f_printer.c | 6 +++--- drivers/usb/gadget/function/rndis.c | 4 ++-- drivers/usb/typec/class.c | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-)
drivers/usb/chipidea/core.c +3 -3
@@ -853,7 +853,7 @@ struct platform_device *ci_hdrc_add_device(struct device *dev,if (ret)return ERR_PTR (ret); - id =ida_simple_get (&ci_ida,0 ,0 ,GFP_KERNEL ); + id =ida_alloc (&ci_ida,GFP_KERNEL );if (id <0 )return ERR_PTR (id);
@@ -883,7 +883,7 @@ struct platform_device *ci_hdrc_add_device(struct device *dev, err:platform_device_put (pdev); put_id: -ida_simple_remove (&ci_ida, id); +ida_free (&ci_ida, id);return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (ci_hdrc_add_device);
@@ -892,7 +892,7 @@ void ci_hdrc_remove_device(struct platform_device *pdev) {int id = pdev->id;platform_device_unregister (pdev); -ida_simple_remove (&ci_ida, id); +ida_free (&ci_ida, id); }EXPORT_SYMBOL_GPL (ci_hdrc_remove_device);
drivers/usb/gadget/function/f_hid.c +3 -3
@@ -1028,9 +1028,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 ; }
@@ -1175,7 +1175,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)
drivers/usb/gadget/function/f_printer.c +3 -3
@@ -1316,9 +1316,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 ; }
@@ -1327,7 +1327,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 );
drivers/usb/gadget/function/rndis.c +2 -2
@@ -869,12 +869,12 @@ EXPORT_SYMBOL_GPL(rndis_msg_parser);static inline int rndis_get_nr (void ) { -return ida_simple_get (&rndis_ida,0 ,0 ,GFP_KERNEL ); +return ida_alloc (&rndis_ida,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)
drivers/usb/typec/class.c +4 -4
@@ -474,7 +474,7 @@ static int altmode_id_get(struct device *dev)else ids = &to_typec_port (dev)->mode_ids; -return ida_simple_get (ids,0 ,0 ,GFP_KERNEL ); +return ida_alloc (ids,GFP_KERNEL ); }static void altmode_id_remove (struct device *dev,int id)
@@ -488,7 +488,7 @@ static void altmode_id_remove(struct device *dev, int id)else ids = &to_typec_port (dev)->mode_ids; -ida_simple_remove (ids, id); +ida_free (ids, id); }static void typec_altmode_release (struct device *dev)
@@ -1599,7 +1599,7 @@ static void typec_release(struct device *dev) {struct typec_port *port =to_typec_port (dev); -ida_simple_remove (&typec_index_ida, port->id); +ida_free (&typec_index_ida, port->id);ida_destroy (&port->mode_ids);typec_switch_put (port->sw);typec_mux_put (port->mux);
@@ -2042,7 +2042,7 @@ struct typec_port *typec_register_port(struct device *parent,if (!port)return ERR_PTR (-ENOMEM ); - id =ida_simple_get (&typec_index_ida,0 ,0 ,GFP_KERNEL ); + id =ida_alloc (&typec_index_ida,GFP_KERNEL );if (id <0 ) {kfree (port);return ERR_PTR (id);
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 4 lines · keliu
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .Signed-off-by keliu <[email protected]>
I need a real name here, one that you use to sign legal documents.
Quoted 6 lines
--- drivers/usb/chipidea/core.c | 6 +++--- drivers/usb/gadget/function/f_hid.c | 6 +++--- drivers/usb/gadget/function/f_printer.c | 6 +++--- drivers/usb/gadget/function/rndis.c | 4 ++-- drivers/usb/typec/class.c | 8 ++++----
Please break this up into one-per-driver.
thanks,
greg k-h