diff options
author | Frank Seidel <frank@f-seidel.de> | 2009-02-05 10:16:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:20:30 -0400 |
commit | 6f8aa65b52037123beab573432e371c0f70b7b9a (patch) | |
tree | c83c7a4190f9f1f5c13c5332d316abc99efaecfd /drivers/usb/storage/alauda.c | |
parent | c49cfa9170256295f4a0fd1668a2411fc05d6b33 (diff) |
USB: add missing KERN_* constants to printks
According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the missing peaces here for the usb subsystem.
Signed-off-by: Frank Seidel <frank@f-seidel.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/alauda.c')
-rw-r--r-- | drivers/usb/storage/alauda.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c index 8d3711a7ff06..5407411e30e0 100644 --- a/drivers/usb/storage/alauda.c +++ b/drivers/usb/storage/alauda.c | |||
@@ -307,7 +307,8 @@ static int alauda_init_media(struct us_data *us) | |||
307 | data[0], data[1], data[2], data[3]); | 307 | data[0], data[1], data[2], data[3]); |
308 | media_info = alauda_card_find_id(data[1]); | 308 | media_info = alauda_card_find_id(data[1]); |
309 | if (media_info == NULL) { | 309 | if (media_info == NULL) { |
310 | printk("alauda_init_media: Unrecognised media signature: " | 310 | printk(KERN_WARNING |
311 | "alauda_init_media: Unrecognised media signature: " | ||
311 | "%02X %02X %02X %02X\n", | 312 | "%02X %02X %02X %02X\n", |
312 | data[0], data[1], data[2], data[3]); | 313 | data[0], data[1], data[2], data[3]); |
313 | return USB_STOR_TRANSPORT_ERROR; | 314 | return USB_STOR_TRANSPORT_ERROR; |
@@ -518,7 +519,8 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) | |||
518 | 519 | ||
519 | /* check even parity */ | 520 | /* check even parity */ |
520 | if (parity[data[6] ^ data[7]]) { | 521 | if (parity[data[6] ^ data[7]]) { |
521 | printk("alauda_read_map: Bad parity in LBA for block %d" | 522 | printk(KERN_WARNING |
523 | "alauda_read_map: Bad parity in LBA for block %d" | ||
522 | " (%02X %02X)\n", i, data[6], data[7]); | 524 | " (%02X %02X)\n", i, data[6], data[7]); |
523 | pba_to_lba[i] = UNUSABLE; | 525 | pba_to_lba[i] = UNUSABLE; |
524 | continue; | 526 | continue; |
@@ -538,13 +540,16 @@ static int alauda_read_map(struct us_data *us, unsigned int zone) | |||
538 | */ | 540 | */ |
539 | 541 | ||
540 | if (lba_offset >= uzonesize) { | 542 | if (lba_offset >= uzonesize) { |
541 | printk("alauda_read_map: Bad low LBA %d for block %d\n", | 543 | printk(KERN_WARNING |
544 | "alauda_read_map: Bad low LBA %d for block %d\n", | ||
542 | lba_real, blocknum); | 545 | lba_real, blocknum); |
543 | continue; | 546 | continue; |
544 | } | 547 | } |
545 | 548 | ||
546 | if (lba_to_pba[lba_offset] != UNDEF) { | 549 | if (lba_to_pba[lba_offset] != UNDEF) { |
547 | printk("alauda_read_map: LBA %d seen for PBA %d and %d\n", | 550 | printk(KERN_WARNING |
551 | "alauda_read_map: " | ||
552 | "LBA %d seen for PBA %d and %d\n", | ||
548 | lba_real, lba_to_pba[lba_offset], blocknum); | 553 | lba_real, lba_to_pba[lba_offset], blocknum); |
549 | continue; | 554 | continue; |
550 | } | 555 | } |
@@ -712,13 +717,15 @@ static int alauda_write_lba(struct us_data *us, u16 lba, | |||
712 | if (pba == 1) { | 717 | if (pba == 1) { |
713 | /* Maybe it is impossible to write to PBA 1. | 718 | /* Maybe it is impossible to write to PBA 1. |
714 | Fake success, but don't do anything. */ | 719 | Fake success, but don't do anything. */ |
715 | printk("alauda_write_lba: avoid writing to pba 1\n"); | 720 | printk(KERN_WARNING |
721 | "alauda_write_lba: avoid writing to pba 1\n"); | ||
716 | return USB_STOR_TRANSPORT_GOOD; | 722 | return USB_STOR_TRANSPORT_GOOD; |
717 | } | 723 | } |
718 | 724 | ||
719 | new_pba = alauda_find_unused_pba(&MEDIA_INFO(us), zone); | 725 | new_pba = alauda_find_unused_pba(&MEDIA_INFO(us), zone); |
720 | if (!new_pba) { | 726 | if (!new_pba) { |
721 | printk("alauda_write_lba: Out of unused blocks\n"); | 727 | printk(KERN_WARNING |
728 | "alauda_write_lba: Out of unused blocks\n"); | ||
722 | return USB_STOR_TRANSPORT_ERROR; | 729 | return USB_STOR_TRANSPORT_ERROR; |
723 | } | 730 | } |
724 | 731 | ||
@@ -818,7 +825,7 @@ static int alauda_read_data(struct us_data *us, unsigned long address, | |||
818 | len = min(sectors, blocksize) * (pagesize + 64); | 825 | len = min(sectors, blocksize) * (pagesize + 64); |
819 | buffer = kmalloc(len, GFP_NOIO); | 826 | buffer = kmalloc(len, GFP_NOIO); |
820 | if (buffer == NULL) { | 827 | if (buffer == NULL) { |
821 | printk("alauda_read_data: Out of memory\n"); | 828 | printk(KERN_WARNING "alauda_read_data: Out of memory\n"); |
822 | return USB_STOR_TRANSPORT_ERROR; | 829 | return USB_STOR_TRANSPORT_ERROR; |
823 | } | 830 | } |
824 | 831 | ||
@@ -911,7 +918,7 @@ static int alauda_write_data(struct us_data *us, unsigned long address, | |||
911 | len = min(sectors, blocksize) * pagesize; | 918 | len = min(sectors, blocksize) * pagesize; |
912 | buffer = kmalloc(len, GFP_NOIO); | 919 | buffer = kmalloc(len, GFP_NOIO); |
913 | if (buffer == NULL) { | 920 | if (buffer == NULL) { |
914 | printk("alauda_write_data: Out of memory\n"); | 921 | printk(KERN_WARNING "alauda_write_data: Out of memory\n"); |
915 | return USB_STOR_TRANSPORT_ERROR; | 922 | return USB_STOR_TRANSPORT_ERROR; |
916 | } | 923 | } |
917 | 924 | ||
@@ -921,7 +928,7 @@ static int alauda_write_data(struct us_data *us, unsigned long address, | |||
921 | */ | 928 | */ |
922 | blockbuffer = kmalloc((pagesize + 64) * blocksize, GFP_NOIO); | 929 | blockbuffer = kmalloc((pagesize + 64) * blocksize, GFP_NOIO); |
923 | if (blockbuffer == NULL) { | 930 | if (blockbuffer == NULL) { |
924 | printk("alauda_write_data: Out of memory\n"); | 931 | printk(KERN_WARNING "alauda_write_data: Out of memory\n"); |
925 | kfree(buffer); | 932 | kfree(buffer); |
926 | return USB_STOR_TRANSPORT_ERROR; | 933 | return USB_STOR_TRANSPORT_ERROR; |
927 | } | 934 | } |