diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-08-31 15:08:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:01 -0400 |
commit | b9391f4160a62f8c44bee6b93dab33cf329857c7 (patch) | |
tree | 25c81fb6ac4410164911d58dc66df246029cc2e7 | |
parent | e0f14c2574ded46b9ec8a1518922d07bc4001c18 (diff) |
V4L/DVB (10751): sms1xxx: fix checkpatch.pl violations introduced by previous changeset
Fix checkpatch.pl violations introduced by previous changeset:
ERROR: do not use C99 // comments
156: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1373:
+//#ifdef DVB_CORE
ERROR: do not use C99 // comments
157: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1374:
+// smsdvb_unregister();
ERROR: do not use C99 // comments
158: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1375:
+//#endif
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
163: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1380:
+EXPORT_SYMBOL(smscore_onresponse);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
164: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1381:
+EXPORT_SYMBOL(sms_get_board);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
165: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1382:
+EXPORT_SYMBOL(sms_debug);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
166: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1383:
+EXPORT_SYMBOL(smscore_putbuffer);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
167: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1384:
+EXPORT_SYMBOL(smscore_registry_getmode);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
168: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1385:
+EXPORT_SYMBOL(smscore_register_device);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
169: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1386:
+EXPORT_SYMBOL(smscore_set_board_id);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
170: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1387:
+EXPORT_SYMBOL(smscore_start_device);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
171: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1388:
+EXPORT_SYMBOL(smsusb_id_table);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
172: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1389:
+EXPORT_SYMBOL(smscore_unregister_device);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
173: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1390:
+EXPORT_SYMBOL(smscore_getbuffer);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
174: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1391:
+EXPORT_SYMBOL(smscore_get_device_mode);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
175: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1392:
+EXPORT_SYMBOL(smscore_register_client);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
176: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1393:
+EXPORT_SYMBOL(smscore_unregister_hotplug);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
177: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1394:
+EXPORT_SYMBOL(smsclient_sendrequest);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
178: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1395:
+EXPORT_SYMBOL(smscore_unregister_client);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
179: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1396:
+EXPORT_SYMBOL(smscore_get_board_id);
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
180: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:1397:
+EXPORT_SYMBOL(smscore_register_hotplug);
WARNING: line over 80 characters
391: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:398:
+extern int smscore_get_fw_filename(struct smscore_device_t *coredev, int mode, char* filename);
ERROR: "foo* bar" should be "foo *bar"
391: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:398:
+extern int smscore_get_fw_filename(struct smscore_device_t *coredev, int mode, char* filename);
WARNING: line over 80 characters
392: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:399:
+extern int smscore_send_fw_file(struct smscore_device_t *coredev, u8* ufwbuf,int size);
ERROR: "foo* bar" should be "foo *bar"
392: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:399:
+extern int smscore_send_fw_file(struct smscore_device_t *coredev, u8* ufwbuf,int size);
ERROR: space required after that ',' (ctx:VxV)
392: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:399:
+extern int smscore_send_fw_file(struct smscore_device_t *coredev, u8* ufwbuf,int size);
^
WARNING: __func__ should be used instead of gcc specific __FUNCTION__
489: FILE: linux/drivers/media/dvb/siano/smsusb.c:443:
+ printk(KERN_INFO"%s Entering status %d.\n", __FUNCTION__, msg.event);
WARNING: __func__ should be used instead of gcc specific __FUNCTION__
501: FILE: linux/drivers/media/dvb/siano/smsusb.c:455:
+ printk(KERN_INFO "%s Entering.\n", __FUNCTION__);
ERROR: space prohibited before that '++' (ctx:WxB)
505: FILE: linux/drivers/media/dvb/siano/smsusb.c:459:
+ for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i ++)
^
WARNING: __func__ should be used instead of gcc specific __FUNCTION__
517: FILE: linux/drivers/media/dvb/siano/smsusb.c:471:
+ __FUNCTION__, rc);
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
[mchehab@redhat.com: sms_dbg were declared on 3 different files]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/siano/sms-cards.c | 5 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smscoreapi.c | 41 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smscoreapi.h | 10 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smsusb.c | 9 |
4 files changed, 32 insertions, 33 deletions
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c index 39f83faa226e..4fa86f5b7fc5 100644 --- a/drivers/media/dvb/siano/sms-cards.c +++ b/drivers/media/dvb/siano/sms-cards.c | |||
@@ -86,6 +86,7 @@ struct sms_board *sms_get_board(int id) | |||
86 | 86 | ||
87 | return &sms_boards[id]; | 87 | return &sms_boards[id]; |
88 | } | 88 | } |
89 | EXPORT_SYMBOL(sms_get_board); | ||
89 | 90 | ||
90 | static int sms_set_gpio(struct smscore_device_t *coredev, int pin, int enable) | 91 | static int sms_set_gpio(struct smscore_device_t *coredev, int pin, int enable) |
91 | { | 92 | { |
@@ -138,6 +139,7 @@ int sms_board_setup(struct smscore_device_t *coredev) | |||
138 | } | 139 | } |
139 | return 0; | 140 | return 0; |
140 | } | 141 | } |
142 | EXPORT_SYMBOL(sms_board_setup); | ||
141 | 143 | ||
142 | int sms_board_power(struct smscore_device_t *coredev, int onoff) | 144 | int sms_board_power(struct smscore_device_t *coredev, int onoff) |
143 | { | 145 | { |
@@ -159,6 +161,7 @@ int sms_board_power(struct smscore_device_t *coredev, int onoff) | |||
159 | } | 161 | } |
160 | return 0; | 162 | return 0; |
161 | } | 163 | } |
164 | EXPORT_SYMBOL(sms_board_power); | ||
162 | 165 | ||
163 | int sms_board_led_feedback(struct smscore_device_t *coredev, int led) | 166 | int sms_board_led_feedback(struct smscore_device_t *coredev, int led) |
164 | { | 167 | { |
@@ -181,6 +184,7 @@ int sms_board_led_feedback(struct smscore_device_t *coredev, int led) | |||
181 | } | 184 | } |
182 | return 0; | 185 | return 0; |
183 | } | 186 | } |
187 | EXPORT_SYMBOL(sms_board_led_feedback); | ||
184 | 188 | ||
185 | int sms_board_lna_control(struct smscore_device_t *coredev, int onoff) | 189 | int sms_board_lna_control(struct smscore_device_t *coredev, int onoff) |
186 | { | 190 | { |
@@ -199,3 +203,4 @@ int sms_board_lna_control(struct smscore_device_t *coredev, int onoff) | |||
199 | } | 203 | } |
200 | return -EINVAL; | 204 | return -EINVAL; |
201 | } | 205 | } |
206 | EXPORT_SYMBOL(sms_board_lna_control); | ||
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c index 6b33acd861da..d2669c8408ea 100644 --- a/drivers/media/dvb/siano/smscoreapi.c +++ b/drivers/media/dvb/siano/smscoreapi.c | |||
@@ -34,8 +34,8 @@ | |||
34 | #include "smscoreapi.h" | 34 | #include "smscoreapi.h" |
35 | #include "sms-cards.h" | 35 | #include "sms-cards.h" |
36 | 36 | ||
37 | int sms_debug; | 37 | int sms_dbg; |
38 | module_param_named(debug, sms_debug, int, 0644); | 38 | module_param_named(debug, sms_dbg, int, 0644); |
39 | MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))"); | 39 | MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))"); |
40 | 40 | ||
41 | struct smscore_device_notifyee_t { | 41 | struct smscore_device_notifyee_t { |
@@ -105,11 +105,13 @@ int smscore_led_state(struct smscore_device_t *core, int led) | |||
105 | core->led_state = led; | 105 | core->led_state = led; |
106 | return core->led_state; | 106 | return core->led_state; |
107 | } | 107 | } |
108 | EXPORT_SYMBOL(smscore_set_board_id); | ||
108 | 109 | ||
109 | int smscore_get_board_id(struct smscore_device_t *core) | 110 | int smscore_get_board_id(struct smscore_device_t *core) |
110 | { | 111 | { |
111 | return core->board_id; | 112 | return core->board_id; |
112 | } | 113 | } |
114 | EXPORT_SYMBOL(smscore_get_board_id); | ||
113 | 115 | ||
114 | struct smscore_registry_entry_t { | 116 | struct smscore_registry_entry_t { |
115 | struct list_head entry; | 117 | struct list_head entry; |
@@ -170,6 +172,7 @@ int smscore_registry_getmode(char *devpath) | |||
170 | 172 | ||
171 | return default_mode; | 173 | return default_mode; |
172 | } | 174 | } |
175 | EXPORT_SYMBOL(smscore_registry_getmode); | ||
173 | 176 | ||
174 | static enum sms_device_type_st smscore_registry_gettype(char *devpath) | 177 | static enum sms_device_type_st smscore_registry_gettype(char *devpath) |
175 | { | 178 | { |
@@ -261,6 +264,7 @@ int smscore_register_hotplug(hotplug_t hotplug) | |||
261 | 264 | ||
262 | return rc; | 265 | return rc; |
263 | } | 266 | } |
267 | EXPORT_SYMBOL(smscore_register_hotplug); | ||
264 | 268 | ||
265 | /** | 269 | /** |
266 | * unregister a client callback that called when device plugged in/unplugged | 270 | * unregister a client callback that called when device plugged in/unplugged |
@@ -289,6 +293,7 @@ void smscore_unregister_hotplug(hotplug_t hotplug) | |||
289 | 293 | ||
290 | kmutex_unlock(&g_smscore_deviceslock); | 294 | kmutex_unlock(&g_smscore_deviceslock); |
291 | } | 295 | } |
296 | EXPORT_SYMBOL(smscore_unregister_hotplug); | ||
292 | 297 | ||
293 | static void smscore_notify_clients(struct smscore_device_t *coredev) | 298 | static void smscore_notify_clients(struct smscore_device_t *coredev) |
294 | { | 299 | { |
@@ -432,6 +437,7 @@ int smscore_register_device(struct smsdevice_params_t *params, | |||
432 | 437 | ||
433 | return 0; | 438 | return 0; |
434 | } | 439 | } |
440 | EXPORT_SYMBOL(smscore_register_device); | ||
435 | 441 | ||
436 | /** | 442 | /** |
437 | * sets initial device mode and notifies client hotplugs that device is ready | 443 | * sets initial device mode and notifies client hotplugs that device is ready |
@@ -460,6 +466,7 @@ int smscore_start_device(struct smscore_device_t *coredev) | |||
460 | 466 | ||
461 | return rc; | 467 | return rc; |
462 | } | 468 | } |
469 | EXPORT_SYMBOL(smscore_start_device); | ||
463 | 470 | ||
464 | static int smscore_sendrequest_and_wait(struct smscore_device_t *coredev, | 471 | static int smscore_sendrequest_and_wait(struct smscore_device_t *coredev, |
465 | void *buffer, size_t size, | 472 | void *buffer, size_t size, |
@@ -688,6 +695,7 @@ void smscore_unregister_device(struct smscore_device_t *coredev) | |||
688 | 695 | ||
689 | sms_info("device %p destroyed", coredev); | 696 | sms_info("device %p destroyed", coredev); |
690 | } | 697 | } |
698 | EXPORT_SYMBOL(smscore_unregister_device); | ||
691 | 699 | ||
692 | static int smscore_detect_mode(struct smscore_device_t *coredev) | 700 | static int smscore_detect_mode(struct smscore_device_t *coredev) |
693 | { | 701 | { |
@@ -879,6 +887,7 @@ int smscore_get_device_mode(struct smscore_device_t *coredev) | |||
879 | { | 887 | { |
880 | return coredev->mode; | 888 | return coredev->mode; |
881 | } | 889 | } |
890 | EXPORT_SYMBOL(smscore_get_device_mode); | ||
882 | 891 | ||
883 | /** | 892 | /** |
884 | * find client by response id & type within the clients list. | 893 | * find client by response id & type within the clients list. |
@@ -1006,6 +1015,7 @@ void smscore_onresponse(struct smscore_device_t *coredev, | |||
1006 | smscore_putbuffer(coredev, cb); | 1015 | smscore_putbuffer(coredev, cb); |
1007 | } | 1016 | } |
1008 | } | 1017 | } |
1018 | EXPORT_SYMBOL(smscore_onresponse); | ||
1009 | 1019 | ||
1010 | /** | 1020 | /** |
1011 | * return pointer to next free buffer descriptor from core pool | 1021 | * return pointer to next free buffer descriptor from core pool |
@@ -1031,6 +1041,7 @@ struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev) | |||
1031 | 1041 | ||
1032 | return cb; | 1042 | return cb; |
1033 | } | 1043 | } |
1044 | EXPORT_SYMBOL(smscore_getbuffer); | ||
1034 | 1045 | ||
1035 | /** | 1046 | /** |
1036 | * return buffer descriptor to a pool | 1047 | * return buffer descriptor to a pool |
@@ -1045,6 +1056,7 @@ void smscore_putbuffer(struct smscore_device_t *coredev, | |||
1045 | { | 1056 | { |
1046 | list_add_locked(&cb->entry, &coredev->buffers, &coredev->bufferslock); | 1057 | list_add_locked(&cb->entry, &coredev->buffers, &coredev->bufferslock); |
1047 | } | 1058 | } |
1059 | EXPORT_SYMBOL(smscore_putbuffer); | ||
1048 | 1060 | ||
1049 | static int smscore_validate_client(struct smscore_device_t *coredev, | 1061 | static int smscore_validate_client(struct smscore_device_t *coredev, |
1050 | struct smscore_client_t *client, | 1062 | struct smscore_client_t *client, |
@@ -1124,6 +1136,7 @@ int smscore_register_client(struct smscore_device_t *coredev, | |||
1124 | 1136 | ||
1125 | return 0; | 1137 | return 0; |
1126 | } | 1138 | } |
1139 | EXPORT_SYMBOL(smscore_register_client); | ||
1127 | 1140 | ||
1128 | /** | 1141 | /** |
1129 | * frees smsclient object and all subclients associated with it | 1142 | * frees smsclient object and all subclients associated with it |
@@ -1154,6 +1167,7 @@ void smscore_unregister_client(struct smscore_client_t *client) | |||
1154 | 1167 | ||
1155 | spin_unlock_irqrestore(&coredev->clientslock, flags); | 1168 | spin_unlock_irqrestore(&coredev->clientslock, flags); |
1156 | } | 1169 | } |
1170 | EXPORT_SYMBOL(smscore_unregister_client); | ||
1157 | 1171 | ||
1158 | /** | 1172 | /** |
1159 | * verifies that source id is not taken by another client, | 1173 | * verifies that source id is not taken by another client, |
@@ -1193,6 +1207,7 @@ int smsclient_sendrequest(struct smscore_client_t *client, | |||
1193 | 1207 | ||
1194 | return coredev->sendrequest_handler(coredev->context, buffer, size); | 1208 | return coredev->sendrequest_handler(coredev->context, buffer, size); |
1195 | } | 1209 | } |
1210 | EXPORT_SYMBOL(smsclient_sendrequest); | ||
1196 | 1211 | ||
1197 | 1212 | ||
1198 | int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, | 1213 | int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, |
@@ -1316,31 +1331,9 @@ static void __exit smscore_module_exit(void) | |||
1316 | } | 1331 | } |
1317 | kmutex_unlock(&g_smscore_registrylock); | 1332 | kmutex_unlock(&g_smscore_registrylock); |
1318 | 1333 | ||
1319 | //#ifdef DVB_CORE | ||
1320 | // smsdvb_unregister(); | ||
1321 | //#endif | ||
1322 | |||
1323 | sms_debug(""); | 1334 | sms_debug(""); |
1324 | } | 1335 | } |
1325 | 1336 | ||
1326 | EXPORT_SYMBOL(smscore_onresponse); | ||
1327 | EXPORT_SYMBOL(sms_get_board); | ||
1328 | EXPORT_SYMBOL(sms_debug); | ||
1329 | EXPORT_SYMBOL(smscore_putbuffer); | ||
1330 | EXPORT_SYMBOL(smscore_registry_getmode); | ||
1331 | EXPORT_SYMBOL(smscore_register_device); | ||
1332 | EXPORT_SYMBOL(smscore_set_board_id); | ||
1333 | EXPORT_SYMBOL(smscore_start_device); | ||
1334 | EXPORT_SYMBOL(smscore_unregister_device); | ||
1335 | EXPORT_SYMBOL(smscore_getbuffer); | ||
1336 | EXPORT_SYMBOL(smscore_get_device_mode); | ||
1337 | EXPORT_SYMBOL(smscore_register_client); | ||
1338 | EXPORT_SYMBOL(smscore_unregister_hotplug); | ||
1339 | EXPORT_SYMBOL(smsclient_sendrequest); | ||
1340 | EXPORT_SYMBOL(smscore_unregister_client); | ||
1341 | EXPORT_SYMBOL(smscore_get_board_id); | ||
1342 | EXPORT_SYMBOL(smscore_register_hotplug); | ||
1343 | |||
1344 | module_init(smscore_module_init); | 1337 | module_init(smscore_module_init); |
1345 | module_exit(smscore_module_exit); | 1338 | module_exit(smscore_module_exit); |
1346 | 1339 | ||
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h index cb2f48485886..e48cd1c98191 100644 --- a/drivers/media/dvb/siano/smscoreapi.h +++ b/drivers/media/dvb/siano/smscoreapi.h | |||
@@ -400,8 +400,10 @@ extern void smscore_onresponse(struct smscore_device_t *coredev, | |||
400 | extern int smscore_get_common_buffer_size(struct smscore_device_t *coredev); | 400 | extern int smscore_get_common_buffer_size(struct smscore_device_t *coredev); |
401 | extern int smscore_map_common_buffer(struct smscore_device_t *coredev, | 401 | extern int smscore_map_common_buffer(struct smscore_device_t *coredev, |
402 | struct vm_area_struct *vma); | 402 | struct vm_area_struct *vma); |
403 | extern int smscore_get_fw_filename(struct smscore_device_t *coredev, int mode, char* filename); | 403 | extern int smscore_get_fw_filename(struct smscore_device_t *coredev, |
404 | extern int smscore_send_fw_file(struct smscore_device_t *coredev, u8* ufwbuf,int size); | 404 | int mode, char *filename); |
405 | extern int smscore_send_fw_file(struct smscore_device_t *coredev, | ||
406 | u8 *ufwbuf, int size); | ||
405 | 407 | ||
406 | extern | 408 | extern |
407 | struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev); | 409 | struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev); |
@@ -420,7 +422,7 @@ int smscore_led_state(struct smscore_device_t *core, int led); | |||
420 | 422 | ||
421 | /* ------------------------------------------------------------------------ */ | 423 | /* ------------------------------------------------------------------------ */ |
422 | 424 | ||
423 | extern int sms_debug; | 425 | extern int sms_dbg; |
424 | 426 | ||
425 | #define DBG_INFO 1 | 427 | #define DBG_INFO 1 |
426 | #define DBG_ADV 2 | 428 | #define DBG_ADV 2 |
@@ -429,7 +431,7 @@ extern int sms_debug; | |||
429 | printk(kern "%s: " fmt "\n", __func__, ##arg) | 431 | printk(kern "%s: " fmt "\n", __func__, ##arg) |
430 | 432 | ||
431 | #define dprintk(kern, lvl, fmt, arg...) do {\ | 433 | #define dprintk(kern, lvl, fmt, arg...) do {\ |
432 | if (sms_debug & lvl) \ | 434 | if (sms_dbg & lvl) \ |
433 | sms_printk(kern, fmt, ##arg); } while (0) | 435 | sms_printk(kern, fmt, ##arg); } while (0) |
434 | 436 | ||
435 | #define sms_log(fmt, arg...) sms_printk(KERN_INFO, fmt, ##arg) | 437 | #define sms_log(fmt, arg...) sms_printk(KERN_INFO, fmt, ##arg) |
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c index 66e413a78a98..5866b6028dec 100644 --- a/drivers/media/dvb/siano/smsusb.c +++ b/drivers/media/dvb/siano/smsusb.c | |||
@@ -436,7 +436,7 @@ static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg) | |||
436 | { | 436 | { |
437 | struct smsusb_device_t *dev = | 437 | struct smsusb_device_t *dev = |
438 | (struct smsusb_device_t *)usb_get_intfdata(intf); | 438 | (struct smsusb_device_t *)usb_get_intfdata(intf); |
439 | printk(KERN_INFO "%s Entering status %d.\n", __func__, msg.event); | 439 | printk(KERN_INFO "%s: Entering status %d.\n", __func__, msg.event); |
440 | smsusb_stop_streaming(dev); | 440 | smsusb_stop_streaming(dev); |
441 | return 0; | 441 | return 0; |
442 | } | 442 | } |
@@ -448,7 +448,7 @@ static int smsusb_resume(struct usb_interface *intf) | |||
448 | (struct smsusb_device_t *)usb_get_intfdata(intf); | 448 | (struct smsusb_device_t *)usb_get_intfdata(intf); |
449 | struct usb_device *udev = interface_to_usbdev(intf); | 449 | struct usb_device *udev = interface_to_usbdev(intf); |
450 | 450 | ||
451 | printk(KERN_INFO "%s Entering.\n", __func__); | 451 | printk(KERN_INFO "%s: Entering.\n", __func__); |
452 | usb_clear_halt(udev, usb_rcvbulkpipe(udev, 0x81)); | 452 | usb_clear_halt(udev, usb_rcvbulkpipe(udev, 0x81)); |
453 | usb_clear_halt(udev, usb_rcvbulkpipe(udev, 0x02)); | 453 | usb_clear_halt(udev, usb_rcvbulkpipe(udev, 0x02)); |
454 | 454 | ||
@@ -463,9 +463,8 @@ static int smsusb_resume(struct usb_interface *intf) | |||
463 | intf->cur_altsetting->desc. | 463 | intf->cur_altsetting->desc. |
464 | bInterfaceNumber, 0); | 464 | bInterfaceNumber, 0); |
465 | if (rc < 0) { | 465 | if (rc < 0) { |
466 | printk(KERN_INFO | 466 | printk(KERN_INFO "%s usb_set_interface failed, " |
467 | "%s usb_set_interface failed, rc %d\n", | 467 | "rc %d\n", __func__, rc); |
468 | __func__, rc); | ||
469 | return rc; | 468 | return rc; |
470 | } | 469 | } |
471 | } | 470 | } |