mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 07:01:57 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: Revert "ide-tape: schedule driver for removal after 6 months" ide: mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted ide: mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted ide: Documentation/ide/ide.txt fixes ide: mark special "ide0=" kernel parameters as obsoleted ide: remove commented out entries from ide_pio_blacklist[]
This commit is contained in:
Linus Torvalds
commit
7f8ed1855d
@ -172,16 +172,6 @@ Who: Len Brown <len.brown@intel.com>
|
||||
|
||||
---------------------------
|
||||
|
||||
What: ide-tape driver
|
||||
When: July 2008
|
||||
Files: drivers/ide/ide-tape.c
|
||||
Why: This driver might not have any users anymore and maintaining it for no
|
||||
reason is an effort no one wants to make.
|
||||
Who: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>, Borislav Petkov
|
||||
<petkovbb@googlemail.com>
|
||||
|
||||
---------------------------
|
||||
|
||||
What: libata spindown skipping and warning
|
||||
When: Dec 2008
|
||||
Why: Some halt(8) implementations synchronize caches for and spin
|
||||
|
||||
@ -105,7 +105,7 @@ Drives are normally found by auto-probing and/or examining the CMOS/BIOS data.
|
||||
For really weird situations, the apparent (fdisk) geometry can also be specified
|
||||
on the kernel "command line" using LILO. The format of such lines is:
|
||||
|
||||
hdx=cyls,heads,sects,wpcom,irq
|
||||
hdx=cyls,heads,sects
|
||||
or hdx=cdrom
|
||||
|
||||
where hdx can be any of hda through hdh, Three values are required
|
||||
@ -214,9 +214,9 @@ driver using the "options=" keyword to insmod, while replacing any ',' with
|
||||
Summary of ide driver parameters for kernel command line
|
||||
--------------------------------------------------------
|
||||
|
||||
"hdx=" is recognized for all "x" from "a" to "h", such as "hdc".
|
||||
"hdx=" is recognized for all "x" from "a" to "u", such as "hdc".
|
||||
|
||||
"idex=" is recognized for all "x" from "0" to "3", such as "ide1".
|
||||
"idex=" is recognized for all "x" from "0" to "9", such as "ide1".
|
||||
|
||||
"hdx=noprobe" : drive may be present, but do not probe for it
|
||||
|
||||
@ -228,13 +228,6 @@ Summary of ide driver parameters for kernel command line
|
||||
|
||||
"hdx=cyl,head,sect" : disk drive is present, with specified geometry
|
||||
|
||||
"hdx=remap" : remap access of sector 0 to sector 1 (for EZDrive)
|
||||
|
||||
"hdx=remap63" : remap the drive: add 63 to all sector numbers
|
||||
(for DM OnTrack)
|
||||
|
||||
"idex=noautotune" : driver will NOT attempt to tune interface speed
|
||||
|
||||
"hdx=autotune" : driver will attempt to tune interface speed
|
||||
to the fastest PIO mode supported,
|
||||
if possible for this drive only.
|
||||
@ -244,10 +237,6 @@ Summary of ide driver parameters for kernel command line
|
||||
|
||||
"hdx=nodma" : disallow DMA
|
||||
|
||||
"hdx=scsi" : the return of the ide-scsi flag, this is useful for
|
||||
allowing ide-floppy, ide-tape, and ide-cdrom|writers
|
||||
to use ide-scsi emulation on a device specific option.
|
||||
|
||||
"idebus=xx" : inform IDE driver of VESA/PCI bus speed in MHz,
|
||||
where "xx" is between 20 and 66 inclusive,
|
||||
used when tuning chipset PIO modes.
|
||||
@ -282,10 +271,6 @@ Summary of ide driver parameters for kernel command line
|
||||
|
||||
"ide=reverse" : formerly called to pci sub-system, but now local.
|
||||
|
||||
The following are valid ONLY on ide0, which usually corresponds
|
||||
to the first ATA interface found on the particular host, and the defaults for
|
||||
the base,ctl ports must not be altered.
|
||||
|
||||
"ide=doubler" : probe/support IDE doublers on Amiga
|
||||
|
||||
There may be more options than shown -- use the source, Luke!
|
||||
|
||||
@ -122,7 +122,6 @@ static struct ide_pio_info {
|
||||
const char *name;
|
||||
int pio;
|
||||
} ide_pio_blacklist [] = {
|
||||
/* { "Conner Peripherals 1275MB - CFS1275A", 4 }, */
|
||||
{ "Conner Peripherals 540MB - CFS540A", 3 },
|
||||
|
||||
{ "WDC AC2700", 3 },
|
||||
@ -138,10 +137,8 @@ static struct ide_pio_info {
|
||||
{ "WDC AC1170", 1 },
|
||||
{ "WDC AC1210", 1 },
|
||||
{ "WDC AC280", 0 },
|
||||
/* { "WDC AC21000", 4 }, */
|
||||
{ "WDC AC31000", 3 },
|
||||
{ "WDC AC31200", 3 },
|
||||
/* { "WDC AC31600", 4 }, */
|
||||
|
||||
{ "Maxtor 7131 AT", 1 },
|
||||
{ "Maxtor 7171 AT", 1 },
|
||||
@ -155,13 +152,6 @@ static struct ide_pio_info {
|
||||
{ "SAMSUNG SHD-3122A", 1 },
|
||||
{ "SAMSUNG SHD-3172A", 1 },
|
||||
|
||||
/* { "ST51080A", 4 },
|
||||
* { "ST51270A", 4 },
|
||||
* { "ST31220A", 4 },
|
||||
* { "ST31640A", 4 },
|
||||
* { "ST32140A", 4 },
|
||||
* { "ST3780A", 4 },
|
||||
*/
|
||||
{ "ST5660A", 3 },
|
||||
{ "ST3660A", 3 },
|
||||
{ "ST3630A", 3 },
|
||||
|
||||
@ -3765,11 +3765,6 @@ static int ide_tape_probe(ide_drive_t *drive)
|
||||
g->fops = &idetape_block_ops;
|
||||
ide_register_region(g);
|
||||
|
||||
printk(KERN_WARNING "It is possible that this driver does not have any"
|
||||
" users anymore and, as a result, it will be REMOVED soon."
|
||||
" Please notify Bart <bzolnier@gmail.com> or Boris"
|
||||
" <petkovbb@gmail.com> in case you still need it.\n");
|
||||
|
||||
return 0;
|
||||
|
||||
out_free_tape:
|
||||
|
||||
@ -1258,7 +1258,7 @@ static int __init ide_setup(char *s)
|
||||
drive = &hwif->drives[unit];
|
||||
if (strncmp(s + 4, "ide-", 4) == 0) {
|
||||
strlcpy(drive->driver_req, s + 4, sizeof(drive->driver_req));
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
}
|
||||
switch (match_parm(&s[3], hd_words, vals, 3)) {
|
||||
case -1: /* "none" */
|
||||
@ -1290,13 +1290,13 @@ static int __init ide_setup(char *s)
|
||||
goto done;
|
||||
case -12: /* "remap" */
|
||||
drive->remap_0_to_1 = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
case -13: /* "remap63" */
|
||||
drive->sect0 = 63;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
case -14: /* "scsi" */
|
||||
drive->scsi = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
case 3: /* cyl,head,sect */
|
||||
drive->media = ide_disk;
|
||||
drive->ready_stat = READY_STAT;
|
||||
@ -1370,32 +1370,32 @@ static int __init ide_setup(char *s)
|
||||
#ifdef CONFIG_BLK_DEV_ALI14XX
|
||||
case -17: /* "ali14xx" */
|
||||
probe_ali14xx = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
#endif
|
||||
#ifdef CONFIG_BLK_DEV_UMC8672
|
||||
case -16: /* "umc8672" */
|
||||
probe_umc8672 = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
#endif
|
||||
#ifdef CONFIG_BLK_DEV_DTC2278
|
||||
case -15: /* "dtc2278" */
|
||||
probe_dtc2278 = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
#endif
|
||||
#ifdef CONFIG_BLK_DEV_CMD640
|
||||
case -14: /* "cmd640_vlb" */
|
||||
cmd640_vlb = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
#endif
|
||||
#ifdef CONFIG_BLK_DEV_HT6560B
|
||||
case -13: /* "ht6560b" */
|
||||
probe_ht6560b = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
#endif
|
||||
#ifdef CONFIG_BLK_DEV_QD65XX
|
||||
case -12: /* "qd65xx" */
|
||||
probe_qd65xx = 1;
|
||||
goto done;
|
||||
goto obsolete_option;
|
||||
#endif
|
||||
#ifdef CONFIG_BLK_DEV_4DRIVES
|
||||
case -11: /* "four" drives on one set of ports */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user