Commit fddaaf44 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix invalid/illegal and printk formatting for scsi drivers

parent efcc77ca
...@@ -4977,7 +4977,7 @@ intr_dma (struct Scsi_Host *host, struct NCR53c7x0_cmd *cmd) { ...@@ -4977,7 +4977,7 @@ intr_dma (struct Scsi_Host *host, struct NCR53c7x0_cmd *cmd) {
hostdata->options |= OPTION_NO_PRINT_RACE; hostdata->options |= OPTION_NO_PRINT_RACE;
} }
} else { } else {
printk(KERN_ALERT "scsi%d : illegal instruction\n", host->host_no); printk(KERN_ALERT "scsi%d : invalid instruction\n", host->host_no);
print_lots (host); print_lots (host);
printk(KERN_ALERT " mail Richard@sleepie.demon.co.uk with ALL\n" printk(KERN_ALERT " mail Richard@sleepie.demon.co.uk with ALL\n"
" boot messages and diagnostic output\n"); " boot messages and diagnostic output\n");
......
...@@ -598,7 +598,7 @@ static int AM53C974_setup(char *str) ...@@ -598,7 +598,7 @@ static int AM53C974_setup(char *str)
(ints[1] == ints[2]) || (ints[1] == ints[2]) ||
(ints[3] < (DEF_CLK / MAX_PERIOD)) || (ints[3] > (DEF_CLK / MIN_PERIOD)) || (ints[3] < (DEF_CLK / MAX_PERIOD)) || (ints[3] > (DEF_CLK / MIN_PERIOD)) ||
(ints[4] < 0) || (ints[4] > MAX_OFFSET)) (ints[4] < 0) || (ints[4] > MAX_OFFSET))
printk("AM53C974_setup: illegal parameter\n"); printk("AM53C974_setup: invalid parameter\n");
else { else {
overrides[commandline_current].host_scsi_id = ints[1]; overrides[commandline_current].host_scsi_id = ints[1];
overrides[commandline_current].target_scsi_id = ints[2]; overrides[commandline_current].target_scsi_id = ints[2];
......
...@@ -3098,7 +3098,7 @@ static void disp_ports(struct Scsi_Host *shpnt) ...@@ -3098,7 +3098,7 @@ static void disp_ports(struct Scsi_Host *shpnt)
printk("MESSAGE IN"); printk("MESSAGE IN");
break; break;
default: default:
printk("*illegal*"); printk("*invalid*");
break; break;
} }
...@@ -3467,7 +3467,7 @@ static int get_ports(struct Scsi_Host *shpnt, char *pos) ...@@ -3467,7 +3467,7 @@ static int get_ports(struct Scsi_Host *shpnt, char *pos)
SPRINTF("MESSAGE IN"); SPRINTF("MESSAGE IN");
break; break;
default: default:
SPRINTF("*illegal*"); SPRINTF("*invalid*");
break; break;
} }
......
...@@ -67,7 +67,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt, ...@@ -67,7 +67,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt,
int nseg, int nseg,
int badseg) int badseg)
{ {
printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%x length %ld\n", printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%x length %u\n",
badseg, nseg, badseg, nseg,
page_address(sgpnt[badseg].page) + sgpnt[badseg].offset, page_address(sgpnt[badseg].page) + sgpnt[badseg].offset,
SCSI_SG_PA(&sgpnt[badseg]), SCSI_SG_PA(&sgpnt[badseg]),
......
...@@ -170,7 +170,7 @@ aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io) ...@@ -170,7 +170,7 @@ aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
case 15: case 15:
break; break;
default: default:
printf("aic7770_config: illegal irq setting %d\n", intdef); printf("aic7770_config: invalid irq setting %d\n", intdef);
return (ENXIO); return (ENXIO);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment