diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-05-22 17:30:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:20:51 -0400 |
commit | 18658117ff844e8117f6b363cb7fa8c5f8ad2cb8 (patch) | |
tree | 0588a927374c7d5ed4d4bff117dd5203ef54342a /drivers/media/dvb/siano/smsusb.c | |
parent | 854470606070d91955f03a7dca3a8024fc2a2540 (diff) |
V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/siano/smsusb.c')
-rw-r--r-- | drivers/media/dvb/siano/smsusb.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c index 20aa878d9d5f..e15f0342d069 100644 --- a/drivers/media/dvb/siano/smsusb.c +++ b/drivers/media/dvb/siano/smsusb.c | |||
@@ -62,7 +62,7 @@ void smsusb_onresponse(struct urb *urb) | |||
62 | 62 | ||
63 | if (urb->status < 0) | 63 | if (urb->status < 0) |
64 | { | 64 | { |
65 | printk(KERN_INFO "%s error, urb status %d, %d bytes\n", __FUNCTION__, urb->status, urb->actual_length); | 65 | printk(KERN_INFO "%s error, urb status %d, %d bytes\n", __func__, urb->status, urb->actual_length); |
66 | return; | 66 | return; |
67 | } | 67 | } |
68 | 68 | ||
@@ -81,7 +81,7 @@ void smsusb_onresponse(struct urb *urb) | |||
81 | // sanity check | 81 | // sanity check |
82 | if (((int) phdr->msgLength + surb->cb->offset) > urb->actual_length) | 82 | if (((int) phdr->msgLength + surb->cb->offset) > urb->actual_length) |
83 | { | 83 | { |
84 | printk("%s: invalid response msglen %d offset %d size %d\n", __FUNCTION__, phdr->msgLength, surb->cb->offset, urb->actual_length); | 84 | printk("%s: invalid response msglen %d offset %d size %d\n", __func__, phdr->msgLength, surb->cb->offset, urb->actual_length); |
85 | goto exit_and_resubmit; | 85 | goto exit_and_resubmit; |
86 | } | 86 | } |
87 | 87 | ||
@@ -96,7 +96,7 @@ void smsusb_onresponse(struct urb *urb) | |||
96 | } | 96 | } |
97 | else | 97 | else |
98 | { | 98 | { |
99 | printk("%s invalid response msglen %d actual %d\n", __FUNCTION__, phdr->msgLength, urb->actual_length); | 99 | printk("%s invalid response msglen %d actual %d\n", __func__, phdr->msgLength, urb->actual_length); |
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
@@ -111,7 +111,7 @@ int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb) | |||
111 | surb->cb = smscore_getbuffer(dev->coredev); | 111 | surb->cb = smscore_getbuffer(dev->coredev); |
112 | if (!surb->cb) | 112 | if (!surb->cb) |
113 | { | 113 | { |
114 | printk(KERN_INFO "%s smscore_getbuffer(...) returned NULL\n", __FUNCTION__); | 114 | printk(KERN_INFO "%s smscore_getbuffer(...) returned NULL\n", __func__); |
115 | return -ENOMEM; | 115 | return -ENOMEM; |
116 | } | 116 | } |
117 | } | 117 | } |
@@ -156,7 +156,7 @@ int smsusb_start_streaming(smsusb_device_t* dev) | |||
156 | rc = smsusb_submit_urb(dev, &dev->surbs[i]); | 156 | rc = smsusb_submit_urb(dev, &dev->surbs[i]); |
157 | if (rc < 0) | 157 | if (rc < 0) |
158 | { | 158 | { |
159 | printk(KERN_INFO "%s smsusb_submit_urb(...) failed\n", __FUNCTION__); | 159 | printk(KERN_INFO "%s smsusb_submit_urb(...) failed\n", __func__); |
160 | smsusb_stop_streaming(dev); | 160 | smsusb_stop_streaming(dev); |
161 | break; | 161 | break; |
162 | } | 162 | } |
@@ -190,14 +190,14 @@ int smsusb1_load_firmware(struct usb_device *udev, int id) | |||
190 | 190 | ||
191 | if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA) | 191 | if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA) |
192 | { | 192 | { |
193 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __FUNCTION__, id); | 193 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __func__, id); |
194 | return -EINVAL; | 194 | return -EINVAL; |
195 | } | 195 | } |
196 | 196 | ||
197 | rc = request_firmware(&fw, smsusb1_fw_lkup[id], &udev->dev); | 197 | rc = request_firmware(&fw, smsusb1_fw_lkup[id], &udev->dev); |
198 | if (rc < 0) | 198 | if (rc < 0) |
199 | { | 199 | { |
200 | printk(KERN_INFO "%s failed to open \"%s\" mode %d\n", __FUNCTION__, smsusb1_fw_lkup[id], id); | 200 | printk(KERN_INFO "%s failed to open \"%s\" mode %d\n", __func__, smsusb1_fw_lkup[id], id); |
201 | return rc; | 201 | return rc; |
202 | } | 202 | } |
203 | 203 | ||
@@ -208,7 +208,7 @@ int smsusb1_load_firmware(struct usb_device *udev, int id) | |||
208 | 208 | ||
209 | rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), fw_buffer, fw->size, &dummy, 1000); | 209 | rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), fw_buffer, fw->size, &dummy, 1000); |
210 | 210 | ||
211 | printk(KERN_INFO "%s: sent %d(%d) bytes, rc %d\n", __FUNCTION__, fw->size, dummy, rc); | 211 | printk(KERN_INFO "%s: sent %d(%d) bytes, rc %d\n", __func__, fw->size, dummy, rc); |
212 | 212 | ||
213 | kfree(fw_buffer); | 213 | kfree(fw_buffer); |
214 | } | 214 | } |
@@ -232,7 +232,7 @@ void smsusb1_detectmode(void *context, int *mode) | |||
232 | if (!product_string) | 232 | if (!product_string) |
233 | { | 233 | { |
234 | product_string = "none"; | 234 | product_string = "none"; |
235 | printk("%s product string not found\n", __FUNCTION__); | 235 | printk("%s product string not found\n", __func__); |
236 | } | 236 | } |
237 | else | 237 | else |
238 | { | 238 | { |
@@ -246,7 +246,7 @@ void smsusb1_detectmode(void *context, int *mode) | |||
246 | *mode = 2; | 246 | *mode = 2; |
247 | } | 247 | } |
248 | 248 | ||
249 | printk("%s: %d \"%s\"\n", __FUNCTION__, *mode, product_string); | 249 | printk("%s: %d \"%s\"\n", __func__, *mode, product_string); |
250 | } | 250 | } |
251 | 251 | ||
252 | int smsusb1_setmode(void *context, int mode) | 252 | int smsusb1_setmode(void *context, int mode) |
@@ -255,7 +255,7 @@ int smsusb1_setmode(void *context, int mode) | |||
255 | 255 | ||
256 | if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) | 256 | if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) |
257 | { | 257 | { |
258 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __FUNCTION__, mode); | 258 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __func__, mode); |
259 | return -EINVAL; | 259 | return -EINVAL; |
260 | } | 260 | } |
261 | 261 | ||
@@ -276,7 +276,7 @@ void smsusb_term_device(struct usb_interface *intf) | |||
276 | 276 | ||
277 | kfree(dev); | 277 | kfree(dev); |
278 | 278 | ||
279 | printk(KERN_INFO "%s device %p destroyed\n", __FUNCTION__, dev); | 279 | printk(KERN_INFO "%s device %p destroyed\n", __func__, dev); |
280 | } | 280 | } |
281 | 281 | ||
282 | usb_set_intfdata(intf, NULL); | 282 | usb_set_intfdata(intf, NULL); |
@@ -292,7 +292,7 @@ int smsusb_init_device(struct usb_interface *intf) | |||
292 | dev = kzalloc(sizeof(smsusb_device_t), GFP_KERNEL); | 292 | dev = kzalloc(sizeof(smsusb_device_t), GFP_KERNEL); |
293 | if (!dev) | 293 | if (!dev) |
294 | { | 294 | { |
295 | printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n", __FUNCTION__); | 295 | printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n", __func__); |
296 | return -ENOMEM; | 296 | return -ENOMEM; |
297 | } | 297 | } |
298 | 298 | ||
@@ -328,7 +328,7 @@ int smsusb_init_device(struct usb_interface *intf) | |||
328 | rc = smscore_register_device(¶ms, &dev->coredev); | 328 | rc = smscore_register_device(¶ms, &dev->coredev); |
329 | if (rc < 0) | 329 | if (rc < 0) |
330 | { | 330 | { |
331 | printk(KERN_INFO "%s smscore_register_device(...) failed, rc %d\n", __FUNCTION__, rc); | 331 | printk(KERN_INFO "%s smscore_register_device(...) failed, rc %d\n", __func__, rc); |
332 | smsusb_term_device(intf); | 332 | smsusb_term_device(intf); |
333 | return rc; | 333 | return rc; |
334 | } | 334 | } |
@@ -343,7 +343,7 @@ int smsusb_init_device(struct usb_interface *intf) | |||
343 | rc = smsusb_start_streaming(dev); | 343 | rc = smsusb_start_streaming(dev); |
344 | if (rc < 0) | 344 | if (rc < 0) |
345 | { | 345 | { |
346 | printk(KERN_INFO "%s smsusb_start_streaming(...) failed\n", __FUNCTION__); | 346 | printk(KERN_INFO "%s smsusb_start_streaming(...) failed\n", __func__); |
347 | smsusb_term_device(intf); | 347 | smsusb_term_device(intf); |
348 | return rc; | 348 | return rc; |
349 | } | 349 | } |
@@ -351,12 +351,12 @@ int smsusb_init_device(struct usb_interface *intf) | |||
351 | rc = smscore_start_device(dev->coredev); | 351 | rc = smscore_start_device(dev->coredev); |
352 | if (rc < 0) | 352 | if (rc < 0) |
353 | { | 353 | { |
354 | printk(KERN_INFO "%s smscore_start_device(...) failed\n", __FUNCTION__); | 354 | printk(KERN_INFO "%s smscore_start_device(...) failed\n", __func__); |
355 | smsusb_term_device(intf); | 355 | smsusb_term_device(intf); |
356 | return rc; | 356 | return rc; |
357 | } | 357 | } |
358 | 358 | ||
359 | printk(KERN_INFO "%s device %p created\n", __FUNCTION__, dev); | 359 | printk(KERN_INFO "%s device %p created\n", __func__, dev); |
360 | 360 | ||
361 | return rc; | 361 | return rc; |
362 | } | 362 | } |
@@ -372,7 +372,7 @@ int smsusb_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
372 | rc = usb_set_interface(udev, intf->cur_altsetting->desc.bInterfaceNumber, 0); | 372 | rc = usb_set_interface(udev, intf->cur_altsetting->desc.bInterfaceNumber, 0); |
373 | if (rc < 0) | 373 | if (rc < 0) |
374 | { | 374 | { |
375 | printk(KERN_INFO "%s usb_set_interface failed, rc %d\n", __FUNCTION__, rc); | 375 | printk(KERN_INFO "%s usb_set_interface failed, rc %d\n", __func__, rc); |
376 | return rc; | 376 | return rc; |
377 | } | 377 | } |
378 | } | 378 | } |
@@ -422,7 +422,7 @@ int smsusb_register(void) | |||
422 | if (rc) | 422 | if (rc) |
423 | printk(KERN_INFO "usb_register failed. Error number %d\n", rc); | 423 | printk(KERN_INFO "usb_register failed. Error number %d\n", rc); |
424 | 424 | ||
425 | printk(KERN_INFO "%s\n", __FUNCTION__); | 425 | printk(KERN_INFO "%s\n", __func__); |
426 | 426 | ||
427 | return rc; | 427 | return rc; |
428 | } | 428 | } |
@@ -431,6 +431,6 @@ void smsusb_unregister(void) | |||
431 | { | 431 | { |
432 | /* Regular USB Cleanup */ | 432 | /* Regular USB Cleanup */ |
433 | usb_deregister(&smsusb_driver); | 433 | usb_deregister(&smsusb_driver); |
434 | printk(KERN_INFO "%s\n", __FUNCTION__); | 434 | printk(KERN_INFO "%s\n", __func__); |
435 | } | 435 | } |
436 | 436 | ||