Commit 227280ad authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Greg Kroah-Hartman
Browse files

usb: gadget: Remove unused usb_remove_config 



usb_remove_config() was added in 2012's
commit Fixes: 51cce6fc ("usb: gadget: composite: Add
usb_remove_config")
but has remained unused.

I see there was a use in drivers/staging/cch that
was removed by
commit 515e6dd2 ("Staging: ccg: delete it from the tree")
but it had it's own copy of usb_remove_config()

Remove it.

Signed-off-by: default avatar"Dr. David Alan Gilbert" <linux@treblig.org>
Link: https://lore.kernel.org/r/20250608233338.179894-3-linux@treblig.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efec475e

drivers/usb/gadget/composite.c

+0 −24
Original line number Diff line number Diff line
@@ -1194,30 +1194,6 @@ static void remove_config(struct usb_composite_dev *cdev, 
	}

}



/**

 * usb_remove_config() - remove a configuration from a device.

 * @cdev: wraps the USB gadget

 * @config: the configuration

 *

 * Drivers must call usb_gadget_disconnect before calling this function

 * to disconnect the device from the host and make sure the host will not

 * try to enumerate the device while we are changing the config list.

 */

void usb_remove_config(struct usb_composite_dev *cdev,

		      struct usb_configuration *config)

{

	unsigned long flags;



	spin_lock_irqsave(&cdev->lock, flags);



	if (cdev->config == config)

		reset_config(cdev);



	spin_unlock_irqrestore(&cdev->lock, flags);



	remove_config(cdev, config);

}



/*-------------------------------------------------------------------------*/



/* We support strings in multiple languages ... string descriptor zero

include/linux/usb/composite.h

+0 −3
Original line number Diff line number Diff line
@@ -339,9 +339,6 @@ int usb_add_config(struct usb_composite_dev *, 
		struct usb_configuration *,

		int (*)(struct usb_configuration *));



void usb_remove_config(struct usb_composite_dev *,

		struct usb_configuration *);



/* predefined index for usb_composite_driver */

enum {

	USB_GADGET_MANUFACTURER_IDX	= 0,