diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-14 12:37:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:09 -0400 |
commit | 3b6004f3b5a8b4506fa8dee29667aed44913a990 (patch) | |
tree | 0f54fd20c8646c7e58a634cddfb5af03730fe9d3 /drivers/usb/atm/usbatm.h | |
parent | 4dc8994806a812044e48514af60d4b4e0315f237 (diff) |
USB: remove warn() macro from usb drivers
USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible. In the
few places that will not work out, use a basic printk().
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/atm/usbatm.h')
-rw-r--r-- | drivers/usb/atm/usbatm.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h index e6887c6cf3cf..f6f4508a9d42 100644 --- a/drivers/usb/atm/usbatm.h +++ b/drivers/usb/atm/usbatm.h | |||
@@ -40,9 +40,15 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #ifdef DEBUG | 42 | #ifdef DEBUG |
43 | #define UDSL_ASSERT(x) BUG_ON(!(x)) | 43 | #define UDSL_ASSERT(instance, x) BUG_ON(!(x)) |
44 | #else | 44 | #else |
45 | #define UDSL_ASSERT(x) do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0) | 45 | #define UDSL_ASSERT(instance, x) \ |
46 | do { \ | ||
47 | if (!(x)) \ | ||
48 | dev_warn(&(instance)->usb_intf->dev, \ | ||
49 | "failed assertion '%s' at line %d", \ | ||
50 | __stringify(x), __LINE__); \ | ||
51 | } while(0) | ||
46 | #endif | 52 | #endif |
47 | 53 | ||
48 | #define usb_err(instance, format, arg...) \ | 54 | #define usb_err(instance, format, arg...) \ |