Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b71c271c authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Greg Kroah-Hartman
Browse files

idr: add ida_is_empty 

[ Upstream commit 99c494077e2d4282a17120a772eecc00ec3004cc ]

Two of the USB Gadgets were poking around in the internals of struct ida
in order to determine if it is empty.  Add the appropriate abstraction.

Link: http://lkml.kernel.org/r/1480369871-5271-63-git-send-email-mawilcox@linuxonhyperv.com


Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Acked-by: default avatarKonstantin Khlebnikov <koct9i@gmail.com>
Tested-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 95cae1b5

drivers/usb/gadget/function/f_hid.c

+3 −3
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static void hidg_free_inst(struct usb_function_instance *f) 
	mutex_lock(&hidg_ida_lock);



	hidg_put_minor(opts->minor);

	if (idr_is_empty(&hidg_ida.idr))

	if (ida_is_empty(&hidg_ida))

		ghid_cleanup();



	mutex_unlock(&hidg_ida_lock);
@@ -958,7 +958,7 @@ static struct usb_function_instance *hidg_alloc_inst(void) 


	mutex_lock(&hidg_ida_lock);



	if (idr_is_empty(&hidg_ida.idr)) {

	if (ida_is_empty(&hidg_ida)) {

		status = ghid_setup(NULL, HIDG_MINORS);

		if (status)  {

			ret = ERR_PTR(status);
@@ -971,7 +971,7 @@ static struct usb_function_instance *hidg_alloc_inst(void) 
	if (opts->minor < 0) {

		ret = ERR_PTR(opts->minor);

		kfree(opts);

		if (idr_is_empty(&hidg_ida.idr))

		if (ida_is_empty(&hidg_ida))

			ghid_cleanup();

		goto unlock;

	}

drivers/usb/gadget/function/f_printer.c

+3 −3
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ static void gprinter_free_inst(struct usb_function_instance *f) 
	mutex_lock(&printer_ida_lock);



	gprinter_put_minor(opts->minor);

	if (idr_is_empty(&printer_ida.idr))

	if (ida_is_empty(&printer_ida))

		gprinter_cleanup();



	mutex_unlock(&printer_ida_lock);
@@ -1300,7 +1300,7 @@ static struct usb_function_instance *gprinter_alloc_inst(void) 


	mutex_lock(&printer_ida_lock);



	if (idr_is_empty(&printer_ida.idr)) {

	if (ida_is_empty(&printer_ida)) {

		status = gprinter_setup(PRINTER_MINORS);

		if (status) {

			ret = ERR_PTR(status);
@@ -1313,7 +1313,7 @@ static struct usb_function_instance *gprinter_alloc_inst(void) 
	if (opts->minor < 0) {

		ret = ERR_PTR(opts->minor);

		kfree(opts);

		if (idr_is_empty(&printer_ida.idr))

		if (ida_is_empty(&printer_ida))

			gprinter_cleanup();

		goto unlock;

	}

include/linux/idr.h

+5 −0
Original line number Diff line number Diff line
@@ -195,6 +195,11 @@ static inline int ida_get_new(struct ida *ida, int *p_id) 
	return ida_get_new_above(ida, 0, p_id);

}



static inline bool ida_is_empty(struct ida *ida)

{

	return idr_is_empty(&ida->idr);

}



void __init idr_init_cache(void);



#endif /* __IDR_H__ */