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

Commit cadb3756 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

uhci: change dependency for debug parameter 



To allow a full switch to dynamic debugging make the
debug parameter conditional on defined(DEBUF) || defined(CONFIG_DYNAMIC_DEBUG)

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ada24a4

drivers/usb/host/uhci-hcd.c

+25 −19
Original line number Original line Diff line number Diff line
@@ -69,18 +69,21 @@ MODULE_PARM_DESC(ignore_oc, "ignore hardware overcurrent indications"); 
 *            show all queues in /sys/kernel/debug/uhci/[pci_addr]

 *            show all queues in /sys/kernel/debug/uhci/[pci_addr]

 * debug = 3, show all TDs in URBs when dumping

 * debug = 3, show all TDs in URBs when dumping

 */

 */

#ifdef DEBUG

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#define DEBUG_CONFIGURED	1



static int debug = 1;

static int debug = 1;

module_param(debug, int, S_IRUGO | S_IWUSR);

module_param(debug, int, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(debug, "Debug level");

MODULE_PARM_DESC(debug, "Debug level");

static char *errbuf;





#else

#else

#define DEBUG_CONFIGURED	0



#define debug 0

#define debug 0

#define errbuf NULL



#endif

#endif





static char *errbuf;



#define ERRBUF_LEN    (32 * 1024)

#define ERRBUF_LEN    (32 * 1024)





static struct kmem_cache *uhci_up_cachep;	/* urb_priv */

static struct kmem_cache *uhci_up_cachep;	/* urb_priv */
@@ -516,13 +519,12 @@ static void release_uhci(struct uhci_hcd *uhci) 
{

{

	int i;

	int i;





	if (DEBUG_CONFIGURED) {



	spin_lock_irq(&uhci->lock);

	spin_lock_irq(&uhci->lock);

	uhci->is_initialized = 0;

	uhci->is_initialized = 0;

	spin_unlock_irq(&uhci->lock);

	spin_unlock_irq(&uhci->lock);





	debugfs_remove(uhci->dentry);

	debugfs_remove(uhci->dentry);

	}





	for (i = 0; i < UHCI_NUM_SKELQH; i++)

	for (i = 0; i < UHCI_NUM_SKELQH; i++)

		uhci_free_qh(uhci, uhci->skelqh[i]);

		uhci_free_qh(uhci, uhci->skelqh[i]);
@@ -868,14 +870,14 @@ static int __init uhci_hcd_init(void) 
			ignore_oc ? ", overcurrent ignored" : "");

			ignore_oc ? ", overcurrent ignored" : "");

	set_bit(USB_UHCI_LOADED, &usb_hcds_loaded);

	set_bit(USB_UHCI_LOADED, &usb_hcds_loaded);





	if (DEBUG_CONFIGURED) {

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

	errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL);

	errbuf = kmalloc(ERRBUF_LEN, GFP_KERNEL);

	if (!errbuf)

	if (!errbuf)

		goto errbuf_failed;

		goto errbuf_failed;

	uhci_debugfs_root = debugfs_create_dir("uhci", usb_debug_root);

	uhci_debugfs_root = debugfs_create_dir("uhci", usb_debug_root);

	if (!uhci_debugfs_root)

	if (!uhci_debugfs_root)

		goto debug_failed;

		goto debug_failed;

	}

#endif





	uhci_up_cachep = kmem_cache_create("uhci_urb_priv",

	uhci_up_cachep = kmem_cache_create("uhci_urb_priv",

		sizeof(struct urb_priv), 0, 0, NULL);

		sizeof(struct urb_priv), 0, 0, NULL);
@@ -906,12 +908,14 @@ static int __init uhci_hcd_init(void) 
	kmem_cache_destroy(uhci_up_cachep);

	kmem_cache_destroy(uhci_up_cachep);





up_failed:

up_failed:

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

	debugfs_remove(uhci_debugfs_root);

	debugfs_remove(uhci_debugfs_root);





debug_failed:

debug_failed:

	kfree(errbuf);

	kfree(errbuf);





errbuf_failed:

errbuf_failed:

#endif





	clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded);

	clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded);

	return retval;

	return retval;
@@ -927,7 +931,9 @@ static void __exit uhci_hcd_cleanup(void) 
#endif

#endif

	kmem_cache_destroy(uhci_up_cachep);

	kmem_cache_destroy(uhci_up_cachep);

	debugfs_remove(uhci_debugfs_root);

	debugfs_remove(uhci_debugfs_root);

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

	kfree(errbuf);

	kfree(errbuf);

#endif

	clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded);

	clear_bit(USB_UHCI_LOADED, &usb_hcds_loaded);

}

}