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>

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>
Frank Seidel · Greg Kroah-Hartman
1 parent c49cfa9170
Showing 6 changed files with 59 additions and 39 deletions Side-by-side Diff
drivers/usb/gadget/fsl_usb2_udc.c
drivers/usb/gadget/lh7a40x_udc.c
drivers/usb/host/isp116x.h
drivers/usb/storage/alauda.c
drivers/usb/storage/sddr09.c
drivers/usb/storage/sddr55.c
@@ -1802,7 +1802,8 @@
  
 out:
 	if (retval)
-		printk("gadget driver register failed %d\n", retval);
+		printk(KERN_WARNING "gadget driver register failed %d\n",
+		       retval);
 	return retval;
 }
 EXPORT_SYMBOL(usb_gadget_register_driver);
@@ -1847,7 +1848,8 @@
 	udc_controller->gadget.dev.driver = NULL;
 	udc_controller->driver = NULL;
  
-	printk("unregistered gadget driver '%s'\n", driver->driver.name);
+	printk(KERN_WARNING "unregistered gadget driver '%s'\n",
+	       driver->driver.name);
 	return 0;
 }
 EXPORT_SYMBOL(usb_gadget_unregister_driver);
@@ -2455,7 +2457,7 @@
 static void __exit udc_exit(void)
 {
 	platform_driver_unregister(&udc_driver);
-	printk("%s unregistered\n", driver_desc);
+	printk(KERN_WARNING "%s unregistered\n", driver_desc);
 }
  
 module_exit(udc_exit);
@@ -432,8 +432,8 @@
 	device_add(&dev->gadget.dev);
 	retval = driver->bind(&dev->gadget);
 	if (retval) {
-		printk("%s: bind to driver %s --> error %d\n", dev->gadget.name,
-		       driver->driver.name, retval);
+		printk(KERN_WARNING "%s: bind to driver %s --> error %d\n",
+		       dev->gadget.name, driver->driver.name, retval);
 		device_del(&dev->gadget.dev);
  
 		dev->driver = 0;
@@ -445,8 +445,8 @@
 	 * for set_configuration as well as eventual disconnect.
 	 * NOTE:  this shouldn't power up until later.
 	 */
-	printk("%s: registered gadget driver '%s'\n", dev->gadget.name,
-	       driver->driver.name);
+	printk(KERN_WARNING "%s: registered gadget driver '%s'\n",
+	       dev->gadget.name, driver->driver.name);
  
 	udc_enable(dev);
  
@@ -581,7 +581,8 @@
 			 * discard the extra data.
 			 */
 			if (req->req.status != -EOVERFLOW)
-				printk("%s overflow %d\n", ep->ep.name, count);
+				printk(KERN_WARNING "%s overflow %d\n",
+				       ep->ep.name, count);
 			req->req.status = -EOVERFLOW;
 		} else {
 			*buf++ = byte;
@@ -831,7 +832,8 @@
 						       queue);
  
 				if (!req) {
-					printk("%s: NULL REQ %d\n",
+					printk(KERN_WARNING
+					       "%s: NULL REQ %d\n",
 					       __func__, ep_idx);
 					flush(ep);
 					break;
@@ -844,7 +846,7 @@
  
 	} else {
 		/* Throw packet away.. */
-		printk("%s: No descriptor?!?\n", __func__);
+		printk(KERN_WARNING "%s: No descriptor?!?\n", __func__);
 		flush(ep);
 	}
 }
@@ -563,7 +563,7 @@
 */
 static inline void dump_ptd(struct ptd *ptd)
 {
-	printk("td: %x %d%c%d %d,%d,%d  %x %x%x%x\n",
+	printk(KERN_WARNING "td: %x %d%c%d %d,%d,%d  %x %x%x%x\n",
 	       PTD_GET_CC(ptd), PTD_GET_FA(ptd),
 	       PTD_DIR_STR(ptd), PTD_GET_EP(ptd),
 	       PTD_GET_COUNT(ptd), PTD_GET_LEN(ptd), PTD_GET_MPS(ptd),
@@ -576,7 +576,7 @@
 	int k;
  
 	if (PTD_GET_DIR(ptd) != PTD_DIR_IN && PTD_GET_LEN(ptd)) {
-		printk("-> ");
+		printk(KERN_WARNING "-> ");
 		for (k = 0; k < PTD_GET_LEN(ptd); ++k)
 			printk("%02x ", ((u8 *) buf)[k]);
 		printk("\n");
  
@@ -588,13 +588,13 @@
 	int k;
  
 	if (PTD_GET_DIR(ptd) == PTD_DIR_IN && PTD_GET_COUNT(ptd)) {
-		printk("<- ");
+		printk(KERN_WARNING "<- ");
 		for (k = 0; k < PTD_GET_COUNT(ptd); ++k)
 			printk("%02x ", ((u8 *) buf)[k]);
 		printk("\n");
 	}
 	if (PTD_GET_LAST(ptd))
-		printk("-\n");
+		printk(KERN_WARNING "-\n");
 }
  
 #else
@@ -307,7 +307,8 @@
 		data[0], data[1], data[2], data[3]);
 	media_info = alauda_card_find_id(data[1]);
 	if (media_info == NULL) {
-		printk("alauda_init_media: Unrecognised media signature: "
+		printk(KERN_WARNING
+			"alauda_init_media: Unrecognised media signature: "
 			"%02X %02X %02X %02X\n",
 			data[0], data[1], data[2], data[3]);
 		return USB_STOR_TRANSPORT_ERROR;
@@ -518,7 +519,8 @@
  
 		/* check even parity */
 		if (parity[data[6] ^ data[7]]) {
-			printk("alauda_read_map: Bad parity in LBA for block %d"
+			printk(KERN_WARNING
+			       "alauda_read_map: Bad parity in LBA for block %d"
 			       " (%02X %02X)\n", i, data[6], data[7]);
 			pba_to_lba[i] = UNUSABLE;
 			continue;
  
@@ -538,13 +540,16 @@
 		 */
  
 		if (lba_offset >= uzonesize) {
-			printk("alauda_read_map: Bad low LBA %d for block %d\n",
+			printk(KERN_WARNING
+			       "alauda_read_map: Bad low LBA %d for block %d\n",
 			       lba_real, blocknum);
 			continue;
 		}
  
 		if (lba_to_pba[lba_offset] != UNDEF) {
-			printk("alauda_read_map: LBA %d seen for PBA %d and %d\n",
+			printk(KERN_WARNING
+			       "alauda_read_map: "
+			       "LBA %d seen for PBA %d and %d\n",
 			       lba_real, lba_to_pba[lba_offset], blocknum);
 			continue;
 		}
  
@@ -712,13 +717,15 @@
 	if (pba == 1) {
 		/* Maybe it is impossible to write to PBA 1.
 		   Fake success, but don't do anything. */
-		printk("alauda_write_lba: avoid writing to pba 1\n");
+		printk(KERN_WARNING
+		       "alauda_write_lba: avoid writing to pba 1\n");
 		return USB_STOR_TRANSPORT_GOOD;
 	}
  
 	new_pba = alauda_find_unused_pba(&MEDIA_INFO(us), zone);
 	if (!new_pba) {
-		printk("alauda_write_lba: Out of unused blocks\n");
+		printk(KERN_WARNING
+		       "alauda_write_lba: Out of unused blocks\n");
 		return USB_STOR_TRANSPORT_ERROR;
 	}
  
@@ -818,7 +825,7 @@
 	len = min(sectors, blocksize) * (pagesize + 64);
 	buffer = kmalloc(len, GFP_NOIO);
 	if (buffer == NULL) {
-		printk("alauda_read_data: Out of memory\n");
+		printk(KERN_WARNING "alauda_read_data: Out of memory\n");
 		return USB_STOR_TRANSPORT_ERROR;
 	}
  
@@ -911,7 +918,7 @@
 	len = min(sectors, blocksize) * pagesize;
 	buffer = kmalloc(len, GFP_NOIO);
 	if (buffer == NULL) {
-		printk("alauda_write_data: Out of memory\n");
+		printk(KERN_WARNING "alauda_write_data: Out of memory\n");
 		return USB_STOR_TRANSPORT_ERROR;
 	}
  
@@ -921,7 +928,7 @@
 	 */
 	blockbuffer = kmalloc((pagesize + 64) * blocksize, GFP_NOIO);
 	if (blockbuffer == NULL) {
-		printk("alauda_write_data: Out of memory\n");
+		printk(KERN_WARNING "alauda_write_data: Out of memory\n");
 		kfree(buffer);
 		return USB_STOR_TRANSPORT_ERROR;
 	}
@@ -723,7 +723,7 @@
 	len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
 	buffer = kmalloc(len, GFP_NOIO);
 	if (buffer == NULL) {
-		printk("sddr09_read_data: Out of memory\n");
+		printk(KERN_WARNING "sddr09_read_data: Out of memory\n");
 		return -ENOMEM;
 	}
  
@@ -838,7 +838,8 @@
 	if (pba == UNDEF) {
 		pba = sddr09_find_unused_pba(info, lba);
 		if (!pba) {
-			printk("sddr09_write_lba: Out of unused blocks\n");
+			printk(KERN_WARNING
+			       "sddr09_write_lba: Out of unused blocks\n");
 			return -ENOSPC;
 		}
 		info->pba_to_lba[pba] = lba;
@@ -849,7 +850,7 @@
 	if (pba == 1) {
 		/* Maybe it is impossible to write to PBA 1.
 		   Fake success, but don't do anything. */
-		printk("sddr09: avoid writing to pba 1\n");
+		printk(KERN_WARNING "sddr09: avoid writing to pba 1\n");
 		return 0;
 	}
  
@@ -954,7 +955,7 @@
 	blocklen = (pagelen << info->blockshift);
 	blockbuffer = kmalloc(blocklen, GFP_NOIO);
 	if (!blockbuffer) {
-		printk("sddr09_write_data: Out of memory\n");
+		printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
 		return -ENOMEM;
 	}
  
@@ -965,7 +966,7 @@
 	len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
 	buffer = kmalloc(len, GFP_NOIO);
 	if (buffer == NULL) {
-		printk("sddr09_write_data: Out of memory\n");
+		printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
 		kfree(blockbuffer);
 		return -ENOMEM;
 	}
@@ -1112,7 +1113,7 @@
  
 	if (result) {
 		US_DEBUGP("Result of read_deviceID is %d\n", result);
-		printk("sddr09: could not read card info\n");
+		printk(KERN_WARNING "sddr09: could not read card info\n");
 		return NULL;
 	}
  
@@ -1153,7 +1154,7 @@
 		sprintf(blurbtxt + strlen(blurbtxt),
 			", WP");
  
-	printk("%s\n", blurbtxt);
+	printk(KERN_WARNING "%s\n", blurbtxt);
  
 	return cardinfo;
 }
@@ -1184,7 +1185,7 @@
 	alloc_len = (alloc_blocks << CONTROL_SHIFT);
 	buffer = kmalloc(alloc_len, GFP_NOIO);
 	if (buffer == NULL) {
-		printk("sddr09_read_map: out of memory\n");
+		printk(KERN_WARNING "sddr09_read_map: out of memory\n");
 		result = -1;
 		goto done;
 	}
@@ -1198,7 +1199,7 @@
 	info->pba_to_lba = kmalloc(numblocks*sizeof(int), GFP_NOIO);
  
 	if (info->lba_to_pba == NULL || info->pba_to_lba == NULL) {
-		printk("sddr09_read_map: out of memory\n");
+		printk(KERN_WARNING "sddr09_read_map: out of memory\n");
 		result = -1;
 		goto done;
 	}
@@ -1238,7 +1239,8 @@
 			if (ptr[j] != 0)
 				goto nonz;
 		info->pba_to_lba[i] = UNUSABLE;
-		printk("sddr09: PBA %d has no logical mapping\n", i);
+		printk(KERN_WARNING "sddr09: PBA %d has no logical mapping\n",
+		       i);
 		continue;
  
 	nonz:
@@ -1251,7 +1253,8 @@
 	nonff:
 		/* normal PBAs start with six FFs */
 		if (j < 6) {
-			printk("sddr09: PBA %d has no logical mapping: "
+			printk(KERN_WARNING
+			       "sddr09: PBA %d has no logical mapping: "
 			       "reserved area = %02X%02X%02X%02X "
 			       "data status %02X block status %02X\n",
 			       i, ptr[0], ptr[1], ptr[2], ptr[3],
@@ -1261,7 +1264,8 @@
 		}
  
 		if ((ptr[6] >> 4) != 0x01) {
-			printk("sddr09: PBA %d has invalid address field "
+			printk(KERN_WARNING
+			       "sddr09: PBA %d has invalid address field "
 			       "%02X%02X/%02X%02X\n",
 			       i, ptr[6], ptr[7], ptr[11], ptr[12]);
 			info->pba_to_lba[i] = UNUSABLE;
@@ -1270,7 +1274,8 @@
  
 		/* check even parity */
 		if (parity[ptr[6] ^ ptr[7]]) {
-			printk("sddr09: Bad parity in LBA for block %d"
+			printk(KERN_WARNING
+			       "sddr09: Bad parity in LBA for block %d"
 			       " (%02X %02X)\n", i, ptr[6], ptr[7]);
 			info->pba_to_lba[i] = UNUSABLE;
 			continue;
@@ -1289,7 +1294,8 @@
 		 */
  
 		if (lba >= 1000) {
-			printk("sddr09: Bad low LBA %d for block %d\n",
+			printk(KERN_WARNING
+			       "sddr09: Bad low LBA %d for block %d\n",
 			       lba, i);
 			goto possibly_erase;
 		}
@@ -1297,7 +1303,8 @@
 		lba += 1000*(i/0x400);
  
 		if (info->lba_to_pba[lba] != UNDEF) {
-			printk("sddr09: LBA %d seen for PBA %d and %d\n",
+			printk(KERN_WARNING
+			       "sddr09: LBA %d seen for PBA %d and %d\n",
 			       lba, info->lba_to_pba[lba], i);
 			goto possibly_erase;
 		}
@@ -703,7 +703,9 @@
  
 		if (info->lba_to_pba[lba + zone * 1000] != NOT_ALLOCATED &&
 		    !info->force_read_only) {
-			printk("sddr55: map inconsistency at LBA %04X\n", lba + zone * 1000);
+			printk(KERN_WARNING
+			       "sddr55: map inconsistency at LBA %04X\n",
+			       lba + zone * 1000);
 			info->force_read_only = 1;
 		}
...	...	@@ -1802,7 +1802,8 @@
1802	1802
1803	1803	out:
1804	1804	if (retval)
1805		- printk("gadget driver register failed %d\n", retval);
	1805	+ printk(KERN_WARNING "gadget driver register failed %d\n",
	1806	+ retval);
1806	1807	return retval;
1807	1808	}
1808	1809	EXPORT_SYMBOL(usb_gadget_register_driver);
...	...	@@ -1847,7 +1848,8 @@
1847	1848	udc_controller->gadget.dev.driver = NULL;
1848	1849	udc_controller->driver = NULL;
1849	1850
1850		- printk("unregistered gadget driver '%s'\n", driver->driver.name);
	1851	+ printk(KERN_WARNING "unregistered gadget driver '%s'\n",
	1852	+ driver->driver.name);
1851	1853	return 0;
1852	1854	}
1853	1855	EXPORT_SYMBOL(usb_gadget_unregister_driver);
...	...	@@ -2455,7 +2457,7 @@
2455	2457	static void __exit udc_exit(void)
2456	2458	{
2457	2459	platform_driver_unregister(&udc_driver);
2458		- printk("%s unregistered\n", driver_desc);
	2460	+ printk(KERN_WARNING "%s unregistered\n", driver_desc);
2459	2461	}
2460	2462
2461	2463	module_exit(udc_exit);
...	...	@@ -432,8 +432,8 @@
432	432	device_add(&dev->gadget.dev);
433	433	retval = driver->bind(&dev->gadget);
434	434	if (retval) {
435		- printk("%s: bind to driver %s --> error %d\n", dev->gadget.name,
436		- driver->driver.name, retval);
	435	+ printk(KERN_WARNING "%s: bind to driver %s --> error %d\n",
	436	+ dev->gadget.name, driver->driver.name, retval);
437	437	device_del(&dev->gadget.dev);
438	438
439	439	dev->driver = 0;
...	...	@@ -445,8 +445,8 @@
445	445	* for set_configuration as well as eventual disconnect.
446	446	* NOTE: this shouldn't power up until later.
447	447	*/
448		- printk("%s: registered gadget driver '%s'\n", dev->gadget.name,
449		- driver->driver.name);
	448	+ printk(KERN_WARNING "%s: registered gadget driver '%s'\n",
	449	+ dev->gadget.name, driver->driver.name);
450	450
451	451	udc_enable(dev);
452	452
...	...	@@ -581,7 +581,8 @@
581	581	* discard the extra data.
582	582	*/
583	583	if (req->req.status != -EOVERFLOW)
584		- printk("%s overflow %d\n", ep->ep.name, count);
	584	+ printk(KERN_WARNING "%s overflow %d\n",
	585	+ ep->ep.name, count);
585	586	req->req.status = -EOVERFLOW;
586	587	} else {
587	588	*buf++ = byte;
...	...	@@ -831,7 +832,8 @@
831	832	queue);
832	833
833	834	if (!req) {
834		- printk("%s: NULL REQ %d\n",
	835	+ printk(KERN_WARNING
	836	+ "%s: NULL REQ %d\n",
835	837	__func__, ep_idx);
836	838	flush(ep);
837	839	break;
...	...	@@ -844,7 +846,7 @@
844	846
845	847	} else {
846	848	/* Throw packet away.. */
847		- printk("%s: No descriptor?!?\n", __func__);
	849	+ printk(KERN_WARNING "%s: No descriptor?!?\n", __func__);
848	850	flush(ep);
849	851	}
850	852	}
...	...	@@ -563,7 +563,7 @@
563	563	*/
564	564	static inline void dump_ptd(struct ptd *ptd)
565	565	{
566		- printk("td: %x %d%c%d %d,%d,%d %x %x%x%x\n",
	566	+ printk(KERN_WARNING "td: %x %d%c%d %d,%d,%d %x %x%x%x\n",
567	567	PTD_GET_CC(ptd), PTD_GET_FA(ptd),
568	568	PTD_DIR_STR(ptd), PTD_GET_EP(ptd),
569	569	PTD_GET_COUNT(ptd), PTD_GET_LEN(ptd), PTD_GET_MPS(ptd),
...	...	@@ -576,7 +576,7 @@
576	576	int k;
577	577
578	578	if (PTD_GET_DIR(ptd) != PTD_DIR_IN && PTD_GET_LEN(ptd)) {
579		- printk("-> ");
	579	+ printk(KERN_WARNING "-> ");
580	580	for (k = 0; k < PTD_GET_LEN(ptd); ++k)
581	581	printk("%02x ", ((u8 *) buf)[k]);
582	582	printk("\n");
583	583
...	...	@@ -588,13 +588,13 @@
588	588	int k;
589	589
590	590	if (PTD_GET_DIR(ptd) == PTD_DIR_IN && PTD_GET_COUNT(ptd)) {
591		- printk("<- ");
	591	+ printk(KERN_WARNING "<- ");
592	592	for (k = 0; k < PTD_GET_COUNT(ptd); ++k)
593	593	printk("%02x ", ((u8 *) buf)[k]);
594	594	printk("\n");
595	595	}
596	596	if (PTD_GET_LAST(ptd))
597		- printk("-\n");
	597	+ printk(KERN_WARNING "-\n");
598	598	}
599	599
600	600	#else
...	...	@@ -307,7 +307,8 @@
307	307	data[0], data[1], data[2], data[3]);
308	308	media_info = alauda_card_find_id(data[1]);
309	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	312	"%02X %02X %02X %02X\n",
312	313	data[0], data[1], data[2], data[3]);
313	314	return USB_STOR_TRANSPORT_ERROR;
...	...	@@ -518,7 +519,8 @@
518	519
519	520	/* check even parity */
520	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	524	" (%02X %02X)\n", i, data[6], data[7]);
523	525	pba_to_lba[i] = UNUSABLE;
524	526	continue;
525	527
...	...	@@ -538,13 +540,16 @@
538	540	*/
539	541
540	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	545	lba_real, blocknum);
543	546	continue;
544	547	}
545	548
546	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	553	lba_real, lba_to_pba[lba_offset], blocknum);
549	554	continue;
550	555	}
551	556
...	...	@@ -712,13 +717,15 @@
712	717	if (pba == 1) {
713	718	/* Maybe it is impossible to write to PBA 1.
714	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	722	return USB_STOR_TRANSPORT_GOOD;
717	723	}
718	724
719	725	new_pba = alauda_find_unused_pba(&MEDIA_INFO(us), zone);
720	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	729	return USB_STOR_TRANSPORT_ERROR;
723	730	}
724	731
...	...	@@ -818,7 +825,7 @@
818	825	len = min(sectors, blocksize) * (pagesize + 64);
819	826	buffer = kmalloc(len, GFP_NOIO);
820	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	829	return USB_STOR_TRANSPORT_ERROR;
823	830	}
824	831
...	...	@@ -911,7 +918,7 @@
911	918	len = min(sectors, blocksize) * pagesize;
912	919	buffer = kmalloc(len, GFP_NOIO);
913	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	922	return USB_STOR_TRANSPORT_ERROR;
916	923	}
917	924
...	...	@@ -921,7 +928,7 @@
921	928	*/
922	929	blockbuffer = kmalloc((pagesize + 64) * blocksize, GFP_NOIO);
923	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	932	kfree(buffer);
926	933	return USB_STOR_TRANSPORT_ERROR;
927	934	}
...	...	@@ -723,7 +723,7 @@
723	723	len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
724	724	buffer = kmalloc(len, GFP_NOIO);
725	725	if (buffer == NULL) {
726		- printk("sddr09_read_data: Out of memory\n");
	726	+ printk(KERN_WARNING "sddr09_read_data: Out of memory\n");
727	727	return -ENOMEM;
728	728	}
729	729
...	...	@@ -838,7 +838,8 @@
838	838	if (pba == UNDEF) {
839	839	pba = sddr09_find_unused_pba(info, lba);
840	840	if (!pba) {
841		- printk("sddr09_write_lba: Out of unused blocks\n");
	841	+ printk(KERN_WARNING
	842	+ "sddr09_write_lba: Out of unused blocks\n");
842	843	return -ENOSPC;
843	844	}
844	845	info->pba_to_lba[pba] = lba;
...	...	@@ -849,7 +850,7 @@
849	850	if (pba == 1) {
850	851	/* Maybe it is impossible to write to PBA 1.
851	852	Fake success, but don't do anything. */
852		- printk("sddr09: avoid writing to pba 1\n");
	853	+ printk(KERN_WARNING "sddr09: avoid writing to pba 1\n");
853	854	return 0;
854	855	}
855	856
...	...	@@ -954,7 +955,7 @@
954	955	blocklen = (pagelen << info->blockshift);
955	956	blockbuffer = kmalloc(blocklen, GFP_NOIO);
956	957	if (!blockbuffer) {
957		- printk("sddr09_write_data: Out of memory\n");
	958	+ printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
958	959	return -ENOMEM;
959	960	}
960	961
...	...	@@ -965,7 +966,7 @@
965	966	len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
966	967	buffer = kmalloc(len, GFP_NOIO);
967	968	if (buffer == NULL) {
968		- printk("sddr09_write_data: Out of memory\n");
	969	+ printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
969	970	kfree(blockbuffer);
970	971	return -ENOMEM;
971	972	}
...	...	@@ -1112,7 +1113,7 @@
1112	1113
1113	1114	if (result) {
1114	1115	US_DEBUGP("Result of read_deviceID is %d\n", result);
1115		- printk("sddr09: could not read card info\n");
	1116	+ printk(KERN_WARNING "sddr09: could not read card info\n");
1116	1117	return NULL;
1117	1118	}
1118	1119
...	...	@@ -1153,7 +1154,7 @@
1153	1154	sprintf(blurbtxt + strlen(blurbtxt),
1154	1155	", WP");
1155	1156
1156		- printk("%s\n", blurbtxt);
	1157	+ printk(KERN_WARNING "%s\n", blurbtxt);
1157	1158
1158	1159	return cardinfo;
1159	1160	}
...	...	@@ -1184,7 +1185,7 @@
1184	1185	alloc_len = (alloc_blocks << CONTROL_SHIFT);
1185	1186	buffer = kmalloc(alloc_len, GFP_NOIO);
1186	1187	if (buffer == NULL) {
1187		- printk("sddr09_read_map: out of memory\n");
	1188	+ printk(KERN_WARNING "sddr09_read_map: out of memory\n");
1188	1189	result = -1;
1189	1190	goto done;
1190	1191	}
...	...	@@ -1198,7 +1199,7 @@
1198	1199	info->pba_to_lba = kmalloc(numblocks*sizeof(int), GFP_NOIO);
1199	1200
1200	1201	if (info->lba_to_pba == NULL \|\| info->pba_to_lba == NULL) {
1201		- printk("sddr09_read_map: out of memory\n");
	1202	+ printk(KERN_WARNING "sddr09_read_map: out of memory\n");
1202	1203	result = -1;
1203	1204	goto done;
1204	1205	}
...	...	@@ -1238,7 +1239,8 @@
1238	1239	if (ptr[j] != 0)
1239	1240	goto nonz;
1240	1241	info->pba_to_lba[i] = UNUSABLE;
1241		- printk("sddr09: PBA %d has no logical mapping\n", i);
	1242	+ printk(KERN_WARNING "sddr09: PBA %d has no logical mapping\n",
	1243	+ i);
1242	1244	continue;
1243	1245
1244	1246	nonz:
...	...	@@ -1251,7 +1253,8 @@
1251	1253	nonff:
1252	1254	/* normal PBAs start with six FFs */
1253	1255	if (j < 6) {
1254		- printk("sddr09: PBA %d has no logical mapping: "
	1256	+ printk(KERN_WARNING
	1257	+ "sddr09: PBA %d has no logical mapping: "
1255	1258	"reserved area = %02X%02X%02X%02X "
1256	1259	"data status %02X block status %02X\n",
1257	1260	i, ptr[0], ptr[1], ptr[2], ptr[3],
...	...	@@ -1261,7 +1264,8 @@
1261	1264	}
1262	1265
1263	1266	if ((ptr[6] >> 4) != 0x01) {
1264		- printk("sddr09: PBA %d has invalid address field "
	1267	+ printk(KERN_WARNING
	1268	+ "sddr09: PBA %d has invalid address field "
1265	1269	"%02X%02X/%02X%02X\n",
1266	1270	i, ptr[6], ptr[7], ptr[11], ptr[12]);
1267	1271	info->pba_to_lba[i] = UNUSABLE;
...	...	@@ -1270,7 +1274,8 @@
1270	1274
1271	1275	/* check even parity */
1272	1276	if (parity[ptr[6] ^ ptr[7]]) {
1273		- printk("sddr09: Bad parity in LBA for block %d"
	1277	+ printk(KERN_WARNING
	1278	+ "sddr09: Bad parity in LBA for block %d"
1274	1279	" (%02X %02X)\n", i, ptr[6], ptr[7]);
1275	1280	info->pba_to_lba[i] = UNUSABLE;
1276	1281	continue;
...	...	@@ -1289,7 +1294,8 @@
1289	1294	*/
1290	1295
1291	1296	if (lba >= 1000) {
1292		- printk("sddr09: Bad low LBA %d for block %d\n",
	1297	+ printk(KERN_WARNING
	1298	+ "sddr09: Bad low LBA %d for block %d\n",
1293	1299	lba, i);
1294	1300	goto possibly_erase;
1295	1301	}
...	...	@@ -1297,7 +1303,8 @@
1297	1303	lba += 1000*(i/0x400);
1298	1304
1299	1305	if (info->lba_to_pba[lba] != UNDEF) {
1300		- printk("sddr09: LBA %d seen for PBA %d and %d\n",
	1306	+ printk(KERN_WARNING
	1307	+ "sddr09: LBA %d seen for PBA %d and %d\n",
1301	1308	lba, info->lba_to_pba[lba], i);
1302	1309	goto possibly_erase;
1303	1310	}
...	...	@@ -703,7 +703,9 @@
703	703
704	704	if (info->lba_to_pba[lba + zone * 1000] != NOT_ALLOCATED &&
705	705	!info->force_read_only) {
706		- printk("sddr55: map inconsistency at LBA %04X\n", lba + zone * 1000);
	706	+ printk(KERN_WARNING
	707	+ "sddr55: map inconsistency at LBA %04X\n",
	708	+ lba + zone * 1000);
707	709	info->force_read_only = 1;
708	710	}
709	711