diff options
author | Sylwester Nawrocki <snjw23@gmail.com> | 2011-11-06 14:31:45 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-08 08:31:01 -0500 |
commit | 7d462fe580d6b73f0307588b898b2e6c8ad45d41 (patch) | |
tree | a2f4214d213bbb345dcc471f991f581f1b19e0ac /drivers/staging | |
parent | 14e0e4bf6c8c98ef36542280b3147b4e79e7131b (diff) |
[media] staging: as102: Replace printk(KERN_<LEVEL> witk pr_<level>
While at it also correct some spelling errors.
Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/media/as102/as102_fw.c | 26 | ||||
-rw-r--r-- | drivers/staging/media/as102/as102_usb_drv.c | 10 |
2 files changed, 18 insertions, 18 deletions
diff --git a/drivers/staging/media/as102/as102_fw.c b/drivers/staging/media/as102/as102_fw.c index ab7dcdb0ad66..fa569392bb7e 100644 --- a/drivers/staging/media/as102/as102_fw.c +++ b/drivers/staging/media/as102/as102_fw.c | |||
@@ -58,7 +58,7 @@ static int parse_hex_line(unsigned char *fw_data, unsigned char *addr, | |||
58 | unsigned char *src, dst; | 58 | unsigned char *src, dst; |
59 | 59 | ||
60 | if (*fw_data++ != ':') { | 60 | if (*fw_data++ != ':') { |
61 | printk(KERN_ERR "invalid firmware file\n"); | 61 | pr_err("invalid firmware file\n"); |
62 | return -EFAULT; | 62 | return -EFAULT; |
63 | } | 63 | } |
64 | 64 | ||
@@ -191,21 +191,21 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap) | |||
191 | /* request kernel to locate firmware file: part1 */ | 191 | /* request kernel to locate firmware file: part1 */ |
192 | errno = request_firmware(&firmware, fw1, &dev->dev); | 192 | errno = request_firmware(&firmware, fw1, &dev->dev); |
193 | if (errno < 0) { | 193 | if (errno < 0) { |
194 | printk(KERN_ERR "%s: unable to locate firmware file: %s\n", | 194 | pr_err("%s: unable to locate firmware file: %s\n", |
195 | DRIVER_NAME, fw1); | 195 | DRIVER_NAME, fw1); |
196 | goto error; | 196 | goto error; |
197 | } | 197 | } |
198 | 198 | ||
199 | /* initiate firmware upload */ | 199 | /* initiate firmware upload */ |
200 | errno = as102_firmware_upload(bus_adap, cmd_buf, firmware); | 200 | errno = as102_firmware_upload(bus_adap, cmd_buf, firmware); |
201 | if (errno < 0) { | 201 | if (errno < 0) { |
202 | printk(KERN_ERR "%s: error during firmware upload part1\n", | 202 | pr_err("%s: error during firmware upload part1\n", |
203 | DRIVER_NAME); | 203 | DRIVER_NAME); |
204 | goto error; | 204 | goto error; |
205 | } | 205 | } |
206 | 206 | ||
207 | printk(KERN_INFO "%s: fimrware: %s loaded with success\n", | 207 | pr_info("%s: firmware: %s loaded with success\n", |
208 | DRIVER_NAME, fw1); | 208 | DRIVER_NAME, fw1); |
209 | release_firmware(firmware); | 209 | release_firmware(firmware); |
210 | 210 | ||
211 | /* wait for boot to complete */ | 211 | /* wait for boot to complete */ |
@@ -214,21 +214,21 @@ int as102_fw_upload(struct as102_bus_adapter_t *bus_adap) | |||
214 | /* request kernel to locate firmware file: part2 */ | 214 | /* request kernel to locate firmware file: part2 */ |
215 | errno = request_firmware(&firmware, fw2, &dev->dev); | 215 | errno = request_firmware(&firmware, fw2, &dev->dev); |
216 | if (errno < 0) { | 216 | if (errno < 0) { |
217 | printk(KERN_ERR "%s: unable to locate firmware file: %s\n", | 217 | pr_err("%s: unable to locate firmware file: %s\n", |
218 | DRIVER_NAME, fw2); | 218 | DRIVER_NAME, fw2); |
219 | goto error; | 219 | goto error; |
220 | } | 220 | } |
221 | 221 | ||
222 | /* initiate firmware upload */ | 222 | /* initiate firmware upload */ |
223 | errno = as102_firmware_upload(bus_adap, cmd_buf, firmware); | 223 | errno = as102_firmware_upload(bus_adap, cmd_buf, firmware); |
224 | if (errno < 0) { | 224 | if (errno < 0) { |
225 | printk(KERN_ERR "%s: error during firmware upload part2\n", | 225 | pr_err("%s: error during firmware upload part2\n", |
226 | DRIVER_NAME); | 226 | DRIVER_NAME); |
227 | goto error; | 227 | goto error; |
228 | } | 228 | } |
229 | 229 | ||
230 | printk(KERN_INFO "%s: fimrware: %s loaded with success\n", | 230 | pr_info("%s: firmware: %s loaded with success\n", |
231 | DRIVER_NAME, fw2); | 231 | DRIVER_NAME, fw2); |
232 | error: | 232 | error: |
233 | /* free data buffer */ | 233 | /* free data buffer */ |
234 | kfree(cmd_buf); | 234 | kfree(cmd_buf); |
diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c index e0c38548ce2d..3ded7d6fc77f 100644 --- a/drivers/staging/media/as102/as102_usb_drv.c +++ b/drivers/staging/media/as102/as102_usb_drv.c | |||
@@ -337,7 +337,7 @@ static void as102_usb_disconnect(struct usb_interface *intf) | |||
337 | /* decrement usage counter */ | 337 | /* decrement usage counter */ |
338 | kref_put(&as102_dev->kref, as102_usb_release); | 338 | kref_put(&as102_dev->kref, as102_usb_release); |
339 | 339 | ||
340 | printk(KERN_INFO "%s: device has been disconnected\n", DRIVER_NAME); | 340 | pr_info("%s: device has been disconnected\n", DRIVER_NAME); |
341 | 341 | ||
342 | LEAVE(); | 342 | LEAVE(); |
343 | } | 343 | } |
@@ -360,7 +360,7 @@ static int as102_usb_probe(struct usb_interface *intf, | |||
360 | /* This should never actually happen */ | 360 | /* This should never actually happen */ |
361 | if ((sizeof(as102_usb_id_table) / sizeof(struct usb_device_id)) != | 361 | if ((sizeof(as102_usb_id_table) / sizeof(struct usb_device_id)) != |
362 | (sizeof(as102_device_names) / sizeof(const char *))) { | 362 | (sizeof(as102_device_names) / sizeof(const char *))) { |
363 | printk(KERN_ERR "Device names table invalid size"); | 363 | pr_err("Device names table invalid size"); |
364 | return -EINVAL; | 364 | return -EINVAL; |
365 | } | 365 | } |
366 | 366 | ||
@@ -399,7 +399,7 @@ static int as102_usb_probe(struct usb_interface *intf, | |||
399 | goto failed; | 399 | goto failed; |
400 | } | 400 | } |
401 | 401 | ||
402 | printk(KERN_INFO "%s: device has been detected\n", DRIVER_NAME); | 402 | pr_info("%s: device has been detected\n", DRIVER_NAME); |
403 | 403 | ||
404 | /* request buffer allocation for streaming */ | 404 | /* request buffer allocation for streaming */ |
405 | ret = as102_alloc_usb_stream_buffer(as102_dev); | 405 | ret = as102_alloc_usb_stream_buffer(as102_dev); |
@@ -432,8 +432,8 @@ static int as102_open(struct inode *inode, struct file *file) | |||
432 | /* fetch device from usb interface */ | 432 | /* fetch device from usb interface */ |
433 | intf = usb_find_interface(&as102_usb_driver, minor); | 433 | intf = usb_find_interface(&as102_usb_driver, minor); |
434 | if (intf == NULL) { | 434 | if (intf == NULL) { |
435 | printk(KERN_ERR "%s: can't find device for minor %d\n", | 435 | pr_err("%s: can't find device for minor %d\n", |
436 | __func__, minor); | 436 | __func__, minor); |
437 | ret = -ENODEV; | 437 | ret = -ENODEV; |
438 | goto exit; | 438 | goto exit; |
439 | } | 439 | } |