diff options
Diffstat (limited to 'drivers/usb/gadget/rndis.c')
-rw-r--r-- | drivers/usb/gadget/rndis.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index db1b2bfcee4e..3d036647431f 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c | |||
@@ -53,21 +53,18 @@ | |||
53 | */ | 53 | */ |
54 | 54 | ||
55 | #if 0 | 55 | #if 0 |
56 | #define DBG(str,args...) do { \ | ||
57 | if (rndis_debug) \ | ||
58 | printk(KERN_DEBUG str , ## args ); \ | ||
59 | } while (0) | ||
60 | static int rndis_debug = 0; | 56 | static int rndis_debug = 0; |
61 | |||
62 | module_param (rndis_debug, int, 0); | 57 | module_param (rndis_debug, int, 0); |
63 | MODULE_PARM_DESC (rndis_debug, "enable debugging"); | 58 | MODULE_PARM_DESC (rndis_debug, "enable debugging"); |
64 | |||
65 | #else | 59 | #else |
66 | |||
67 | #define rndis_debug 0 | 60 | #define rndis_debug 0 |
68 | #define DBG(str,args...) do{}while(0) | ||
69 | #endif | 61 | #endif |
70 | 62 | ||
63 | #define DBG(str,args...) do { \ | ||
64 | if (rndis_debug) \ | ||
65 | pr_debug(str , ## args); \ | ||
66 | } while (0) | ||
67 | |||
71 | #define RNDIS_MAX_CONFIGS 1 | 68 | #define RNDIS_MAX_CONFIGS 1 |
72 | 69 | ||
73 | 70 | ||
@@ -679,7 +676,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len, | |||
679 | #endif | 676 | #endif |
680 | 677 | ||
681 | default: | 678 | default: |
682 | printk (KERN_WARNING "%s: query unknown OID 0x%08X\n", | 679 | pr_warning("%s: query unknown OID 0x%08X\n", |
683 | __FUNCTION__, OID); | 680 | __FUNCTION__, OID); |
684 | } | 681 | } |
685 | if (retval < 0) | 682 | if (retval < 0) |
@@ -804,7 +801,7 @@ update_linkstate: | |||
804 | #endif /* RNDIS_PM */ | 801 | #endif /* RNDIS_PM */ |
805 | 802 | ||
806 | default: | 803 | default: |
807 | printk (KERN_WARNING "%s: set unknown OID 0x%08X, size %d\n", | 804 | pr_warning("%s: set unknown OID 0x%08X, size %d\n", |
808 | __FUNCTION__, OID, buf_len); | 805 | __FUNCTION__, OID, buf_len); |
809 | } | 806 | } |
810 | 807 | ||
@@ -1126,8 +1123,7 @@ int rndis_msg_parser (u8 configNr, u8 *buf) | |||
1126 | * In one case those messages seemed to relate to the host | 1123 | * In one case those messages seemed to relate to the host |
1127 | * suspending itself. | 1124 | * suspending itself. |
1128 | */ | 1125 | */ |
1129 | printk (KERN_WARNING | 1126 | pr_warning("%s: unknown RNDIS message 0x%08X len %d\n", |
1130 | "%s: unknown RNDIS message 0x%08X len %d\n", | ||
1131 | __FUNCTION__ , MsgType, MsgLength); | 1127 | __FUNCTION__ , MsgType, MsgLength); |
1132 | { | 1128 | { |
1133 | unsigned i; | 1129 | unsigned i; |