dev_dbg: check dev_dbg() arguments
Duplicate what Zach Brown did for pr_debug in commit
8b2a1fd1b3
[akpm@linux-foundation.org: fix a couple of things which broke]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
61a2f59af6
commit
404d5b185b
|
@ -119,8 +119,7 @@ MODULE_PARM_DESC(use_both_schemes,
|
||||||
"first one fails");
|
"first one fails");
|
||||||
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
static inline char *portspeed(int portstatus)
|
||||||
static inline char *portspeed (int portstatus)
|
|
||||||
{
|
{
|
||||||
if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
|
if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
|
||||||
return "480 Mb/s";
|
return "480 Mb/s";
|
||||||
|
@ -129,7 +128,6 @@ static inline char *portspeed (int portstatus)
|
||||||
else
|
else
|
||||||
return "12 Mb/s";
|
return "12 Mb/s";
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Note that hdev or one of its children must be locked! */
|
/* Note that hdev or one of its children must be locked! */
|
||||||
static inline struct usb_hub *hdev_to_hub(struct usb_device *hdev)
|
static inline struct usb_hub *hdev_to_hub(struct usb_device *hdev)
|
||||||
|
|
|
@ -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
|
* or if bus glue did the same (e.g. for PCI add-in cards with
|
||||||
* PCI PM support).
|
* 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
|
if ((ohci->hc_control & OHCI_CTRL_RWC) != 0
|
||||||
&& !device_may_wakeup(hcd->self.controller))
|
&& !device_may_wakeup(hcd->self.controller))
|
||||||
device_init_wakeup(hcd->self.controller, 1);
|
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);
|
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);
|
ohci_dump (ohci, 1);
|
||||||
|
|
||||||
flush_scheduled_work();
|
flush_scheduled_work();
|
||||||
|
|
|
@ -571,7 +571,11 @@ extern const char *dev_driver_string(struct device *dev);
|
||||||
#define dev_dbg(dev, format, arg...) \
|
#define dev_dbg(dev, format, arg...) \
|
||||||
dev_printk(KERN_DEBUG , dev , format , ## arg)
|
dev_printk(KERN_DEBUG , dev , format , ## arg)
|
||||||
#else
|
#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
|
#endif
|
||||||
|
|
||||||
#define dev_err(dev, format, arg...) \
|
#define dev_err(dev, format, arg...) \
|
||||||
|
|
Loading…
Reference in a new issue