Commit 4f68a773 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig

[PATCH] Remove CONFIG_SCSI_DC390T_NOGENSUPP

Now that the Am53C974 driver is gone it doesn't make sense to not
support all Am53C974-based cards, and the amount of code under the ifdef
is tiny anyways.
parent e2723daf
...@@ -1267,29 +1267,10 @@ config SCSI_DC390T ...@@ -1267,29 +1267,10 @@ config SCSI_DC390T
Note that this driver does NOT support Tekram DC390W/U/F, which are Note that this driver does NOT support Tekram DC390W/U/F, which are
based on NCR/Symbios chips. Use "NCR53C8XX SCSI support" for those. based on NCR/Symbios chips. Use "NCR53C8XX SCSI support" for those.
Also note that there is another generic Am53C974 driver,
"AM53/79C974 PCI SCSI support" below. You can pick either one.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called tmscsim. module will be called tmscsim.
config SCSI_DC390T_NOGENSUPP
bool "_omit_ support for non-DC390 adapters"
depends on SCSI_DC390T
---help---
If you say N here, the DC390(T) SCSI driver relies on the DC390
EEPROM to get initial values for its settings, such as speed,
termination, etc. If it can't find this EEPROM, it will use
defaults or the user supplied boot/module parameters. For details
on driver configuration see <file:Documentation/scsi/tmscsim.txt>.
If you say Y here and if no EEPROM is found, the driver gives up and
thus only supports Tekram DC390(T) adapters. This can be useful if
you have a DC390(T) and another Am53C974 based adapter, which, for
some reason, you want to drive with the other AM53C974 driver.
If unsure, say N.
config SCSI_T128 config SCSI_T128
tristate "Trantor T128/T128F/T228 SCSI support" tristate "Trantor T128/T128F/T228 SCSI support"
depends on ISA && SCSI depends on ISA && SCSI
......
...@@ -518,7 +518,6 @@ static void __init dc390_check_for_safe_settings (void) ...@@ -518,7 +518,6 @@ static void __init dc390_check_for_safe_settings (void)
} }
#ifndef CONFIG_SCSI_DC390T_NOGENSUPP
int __initdata tmscsim_def[] = {7, 0 /* 10MHz */, int __initdata tmscsim_def[] = {7, 0 /* 10MHz */,
PARITY_CHK_ | SEND_START_ | EN_DISCONNECT_ PARITY_CHK_ | SEND_START_ | EN_DISCONNECT_
| SYNC_NEGO_ | TAG_QUEUEING_, | SYNC_NEGO_ | TAG_QUEUEING_,
...@@ -546,7 +545,6 @@ static void __init dc390_fill_with_defaults (void) ...@@ -546,7 +545,6 @@ static void __init dc390_fill_with_defaults (void)
if (tmscsim[4] > 5) tmscsim[4] = 4; if (tmscsim[4] > 5) tmscsim[4] = 4;
if (tmscsim[5] > 180) tmscsim[5] = 180; if (tmscsim[5] > 180) tmscsim[5] = 180;
} }
#endif
/* Override defaults on cmdline: /* Override defaults on cmdline:
* tmscsim: AdaptID, MaxSpeed (Index), DevMode (Bitmapped), AdaptMode (Bitmapped) * tmscsim: AdaptID, MaxSpeed (Index), DevMode (Bitmapped), AdaptMode (Bitmapped)
...@@ -2105,10 +2103,6 @@ static int __init DC390_init (PSHT psht, ULONG io_port, UCHAR Irq, PDEVDECL, UCH ...@@ -2105,10 +2103,6 @@ static int __init DC390_init (PSHT psht, ULONG io_port, UCHAR Irq, PDEVDECL, UCH
if (dc390_CheckEEpromCheckSum (PDEV, index)) if (dc390_CheckEEpromCheckSum (PDEV, index))
{ {
#ifdef CONFIG_SCSI_DC390T_NOGENSUPP
printk (KERN_ERR "DC390_init: No EEPROM found!\n");
return( -1 );
#else
int speed; int speed;
dc390_adapname = "AM53C974"; dc390_adapname = "AM53C974";
printk (KERN_INFO "DC390_init: No EEPROM found! Trying default settings ...\n"); printk (KERN_INFO "DC390_init: No EEPROM found! Trying default settings ...\n");
...@@ -2120,7 +2114,6 @@ static int __init DC390_init (PSHT psht, ULONG io_port, UCHAR Irq, PDEVDECL, UCH ...@@ -2120,7 +2114,6 @@ static int __init DC390_init (PSHT psht, ULONG io_port, UCHAR Irq, PDEVDECL, UCH
" DevMode=0x%02x, AdaptMode=0x%02x, TaggedCmnds=%i (%i), DelayReset=%is\n", " DevMode=0x%02x, AdaptMode=0x%02x, TaggedCmnds=%i (%i), DelayReset=%is\n",
tmscsim[0], tmscsim[1], speed/10, speed%10, tmscsim[0], tmscsim[1], speed/10, speed%10,
(UCHAR)tmscsim[2], (UCHAR)tmscsim[3], tmscsim[4], 2 << (tmscsim[4]), tmscsim[5]); (UCHAR)tmscsim[2], (UCHAR)tmscsim[3], tmscsim[4], 2 << (tmscsim[4]), tmscsim[5]);
#endif
} }
else else
{ {
......
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