lkml.org 
[lkml]   [2007]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 46/46] dev_dbg: check dev_dbg() arguments
    Date
    From: Dan Williams <dan.j.williams@intel.com>

    Duplicate what Zach Brown did for pr_debug in commit
    8b2a1fd1b394c60eaa2587716102dd5e9b4e5990

    [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>
    ---
    drivers/usb/core/hub.c | 4 +---
    drivers/usb/host/ohci-hcd.c | 6 ------
    include/linux/device.h | 6 +++++-
    3 files changed, 6 insertions(+), 10 deletions(-)

    diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
    index b89a98e..7a60285 100644
    --- a/drivers/usb/core/hub.c
    +++ b/drivers/usb/core/hub.c
    @@ -119,8 +119,7 @@ MODULE_PARM_DESC(use_both_schemes,
    "first one fails");


    -#ifdef DEBUG
    -static inline char *portspeed (int portstatus)
    +static inline char *portspeed(int portstatus)
    {
    if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
    return "480 Mb/s";
    @@ -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)
    diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
    index f0d29ed..e8bbe8b 100644
    --- a/drivers/usb/host/ohci-hcd.c
    +++ b/drivers/usb/host/ohci-hcd.c
    @@ -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();
    diff --git a/include/linux/device.h b/include/linux/device.h
    index 8511d14..a0cd2ce 100644
    --- a/include/linux/device.h
    +++ b/include/linux/device.h
    @@ -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...) \
    --
    1.5.1.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-27 21:07    [W:4.033 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site