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

[PATCH] remaining illegal/invalid/separate stuff for scsi

parent 3ffaaf34
......@@ -840,7 +840,7 @@ static int BusLogic_InitializeMultiMasterProbeInfo(BusLogic_HostAdapter_T
}
if (IRQ_Channel == 0)
{
BusLogic_Error("BusLogic: IRQ Channel %d illegal for "
BusLogic_Error("BusLogic: IRQ Channel %d invalid for "
"MultiMaster Host Adapter\n", NULL, IRQ_Channel);
BusLogic_Error("at PCI Bus %d Device %d I/O Address 0x%X\n",
NULL, Bus, Device, IO_Address);
......@@ -1112,7 +1112,7 @@ static int BusLogic_InitializeFlashPointProbeInfo(BusLogic_HostAdapter_T
}
if (IRQ_Channel == 0)
{
BusLogic_Error("BusLogic: IRQ Channel %d illegal for "
BusLogic_Error("BusLogic: IRQ Channel %d invalid for "
"FlashPoint Host Adapter\n", NULL, IRQ_Channel);
BusLogic_Error("at PCI Bus %d Device %d I/O Address 0x%X\n",
NULL, Bus, Device, IO_Address);
......@@ -4847,7 +4847,7 @@ static int __init BusLogic_ParseDriverOptions(char *OptionsString)
break;
default:
BusLogic_Error("BusLogic: Invalid Driver Options "
"(illegal I/O Address 0x%X)\n",
"(invalid I/O Address 0x%X)\n",
NULL, IO_Address);
return 0;
}
......@@ -4877,7 +4877,7 @@ static int __init BusLogic_ParseDriverOptions(char *OptionsString)
if (QueueDepth > BusLogic_MaxTaggedQueueDepth)
{
BusLogic_Error("BusLogic: Invalid Driver Options "
"(illegal Queue Depth %d)\n",
"(invalid Queue Depth %d)\n",
NULL, QueueDepth);
return 0;
}
......@@ -4911,7 +4911,7 @@ static int __init BusLogic_ParseDriverOptions(char *OptionsString)
if (QueueDepth == 0 || QueueDepth > BusLogic_MaxTaggedQueueDepth)
{
BusLogic_Error("BusLogic: Invalid Driver Options "
"(illegal Queue Depth %d)\n",
"(invalid Queue Depth %d)\n",
NULL, QueueDepth);
return 0;
}
......@@ -5029,7 +5029,7 @@ static int __init BusLogic_ParseDriverOptions(char *OptionsString)
if (BusSettleTime > 5 * 60)
{
BusLogic_Error("BusLogic: Invalid Driver Options "
"(illegal Bus Settle Time %d)\n",
"(invalid Bus Settle Time %d)\n",
NULL, BusSettleTime);
return 0;
}
......
......@@ -3470,7 +3470,7 @@ void esp_handle(struct NCR_ESP *esp)
* for reselection. See esp100_reconnect_hwbug()
* to see how we try very hard to avoid this.
*/
ESPLOG(("esp%d: illegal command\n", esp->esp_id));
ESPLOG(("esp%d: invalid command\n", esp->esp_id));
esp_dump_state(esp, eregs);
......
......@@ -4256,7 +4256,7 @@ static void esp_handle(struct esp *esp)
* for reselection. See esp100_reconnect_hwbug()
* to see how we try very hard to avoid this.
*/
ESPLOG(("esp%d: illegal command\n", esp->esp_id));
ESPLOG(("esp%d: invalid command\n", esp->esp_id));
esp_dump_state(esp);
......
......@@ -3838,9 +3838,9 @@ static char *async_cache_tab[] = {
/*31*/ "\007\000\002\012\001\013\001"
"GDT HA %u, Fault bus %u, ID %u: old disk detected",
/*32*/ "\007\000\002\012\001\013\001"
"GDT HA %u, Fault bus %u, ID %u: plugging an active disk is illegal",
"GDT HA %u, Fault bus %u, ID %u: plugging an active disk is invalid",
/*33*/ "\007\000\002\012\001\013\001"
"GDT HA %u, Fault bus %u, ID %u: illegal device detected",
"GDT HA %u, Fault bus %u, ID %u: invalid device detected",
/*34*/ "\011\000\002\012\001\013\001\006\004"
"GDT HA %u, Fault bus %u, ID %u: insufficient disk capacity (%lu MB required)",
/*35*/ "\007\000\002\012\001\013\001"
......
......@@ -361,7 +361,7 @@ mac53c94_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
return;
}
if (intr & INTR_ILL_CMD) {
printk(KERN_ERR "53c94: illegal cmd, intr=%x stat=%x seq=%x phase=%d\n",
printk(KERN_ERR "53c94: invalid cmd, intr=%x stat=%x seq=%x phase=%d\n",
intr, stat, seq, state->phase);
cmd_done(state, DID_ERROR << 16);
return;
......
......@@ -5166,7 +5166,7 @@ void ncr_complete (ncb_p np, ccb_p cp)
printk ("extraneous data discarded.\n");
break;
case XE_BAD_PHASE:
printk ("illegal scsi phase (4/5).\n");
printk ("invalid scsi phase (4/5).\n");
break;
default:
printk ("extended error %d.\n", cp->xerr_status);
......
......@@ -813,7 +813,7 @@ foreach $i (@absolute) {
$address = $2;
$length = $3;
die
"$0 : $symbol $i has illegal relative reference at address $address,
"$0 : $symbol $i has invalid relative reference at address $address,
size $length\n"
if ($type eq 'REL');
......@@ -831,12 +831,12 @@ print STDERR "checking external $external \n" if ($debug_external);
$length = $3;
die
"$0 : symbol $label is external, has illegal relative reference at $address,
"$0 : symbol $label is external, has invalid relative reference at $address,
size $length\n"
if ($type eq 'REL');
die
"$0 : symbol $label has illegal reference at $address, size $length\n"
"$0 : symbol $label has invalid reference at $address, size $length\n"
if ((($address % 4) !=0) || ($length != 4));
$symbol = $symbol_values{$external};
......@@ -862,7 +862,7 @@ foreach $label (@label) {
$length = $3;
if ((($address % 4) !=0) || ($length != 4)) {
die "$0 : symbol $label has illegal reference at $1, size $2\n";
die "$0 : symbol $label has invalid reference at $1, size $2\n";
}
if ($type eq 'ABS') {
......
......@@ -3659,7 +3659,7 @@ static int __init st_setup(char *str)
}
}
if (i >= sizeof(parms) / sizeof(struct st_dev_parm))
printk(KERN_WARNING "st: illegal parameter in '%s'\n",
printk(KERN_WARNING "st: invalid parameter in '%s'\n",
stp);
stp = strchr(stp, ',');
if (stp)
......
......@@ -2815,7 +2815,7 @@ int dc390_set_info (char *buffer, int length, PACB pACB)
return (length);
einv_dev:
printk (KERN_WARNING "DC390: Ignore cmnd to illegal Dev(Idx) %i. Valid range: 0 - %i.\n",
printk (KERN_WARNING "DC390: Ignore cmnd to invalid Dev(Idx) %i. Valid range: 0 - %i.\n",
dev, pACB->DCBCnt - 1);
DC390_UNLOCK_ACB;
DC390_UNLOCK_IO(pACB.pScsiHost);
......
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