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

Commit 404d5b18 authored by Dan Williams's avatar Dan Williams Committed by Greg Kroah-Hartman
Browse files

dev_dbg: check dev_dbg() arguments 



Duplicate what Zach Brown did for pr_debug in commit
8b2a1fd1

[akpm@linux-foundation.org: fix a couple of things which broke]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 61a2f59a

drivers/usb/core/hub.c

+1 −3
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ MODULE_PARM_DESC(use_both_schemes, 
		"first one fails");





#ifdef	DEBUG

static inline char *portspeed(int portstatus)

{

	if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
@@ -129,7 +128,6 @@ static inline char *portspeed (int portstatus) 
	else

		return "12 Mb/s";

}

#endif



/* Note that hdev or one of its children must be locked! */

static inline struct usb_hub *hdev_to_hub(struct usb_device *hdev)

drivers/usb/host/ohci-hcd.c

+0 −6
Original line number Diff line number Diff line
@@ -486,9 +486,6 @@ static int ohci_run (struct ohci_hcd *ohci) 
	 * or if bus glue did the same (e.g. for PCI add-in cards with

	 * PCI PM support).

	 */

	ohci_dbg (ohci, "resetting from state '%s', control = 0x%x\n",

			hcfs2string (ohci->hc_control & OHCI_CTRL_HCFS),

			ohci_readl (ohci, &ohci->regs->control));

	if ((ohci->hc_control & OHCI_CTRL_RWC) != 0

			&& !device_may_wakeup(hcd->self.controller))

		device_init_wakeup(hcd->self.controller, 1);
@@ -744,9 +741,6 @@ static void ohci_stop (struct usb_hcd *hcd) 
{

	struct ohci_hcd		*ohci = hcd_to_ohci (hcd);



	ohci_dbg (ohci, "stop %s controller (state 0x%02x)\n",

		hcfs2string (ohci->hc_control & OHCI_CTRL_HCFS),

		hcd->state);

	ohci_dump (ohci, 1);



	flush_scheduled_work();

include/linux/device.h

+5 −1
Original line number Diff line number Diff line
@@ -571,7 +571,11 @@ extern const char *dev_driver_string(struct device *dev); 
#define dev_dbg(dev, format, arg...)		\

	dev_printk(KERN_DEBUG , dev , format , ## arg)

#else

#define dev_dbg(dev, format, arg...) do { (void)(dev); } while (0)

static inline int __attribute__ ((format (printf, 2, 3)))

dev_dbg(struct device * dev, const char * fmt, ...)

{

	return 0;

}

#endif



#define dev_err(dev, format, arg...)		\