Commit 35e57224 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jens Axboe

[PATCH] kill "hdX=noremap"

Since Andries killed ide-geometry, remove "hdX=noremap"
parameter as it is no longer needed.
parent 23898e5c
...@@ -1737,7 +1737,6 @@ static int __initdata is_chipset_set[MAX_HWIFS]; ...@@ -1737,7 +1737,6 @@ static int __initdata is_chipset_set[MAX_HWIFS];
* "hdx=cyl,head,sect" : disk drive is present, with specified geometry * "hdx=cyl,head,sect" : disk drive is present, with specified geometry
* "hdx=remap63" : add 63 to all sector numbers (for OnTrack DM) * "hdx=remap63" : add 63 to all sector numbers (for OnTrack DM)
* "hdx=remap" : remap 0->1 (for EZDrive) * "hdx=remap" : remap 0->1 (for EZDrive)
* "hdx=noremap" : do not remap 0->1 even though EZD was detected
* "hdx=autotune" : driver will attempt to tune interface speed * "hdx=autotune" : driver will attempt to tune interface speed
* to the fastest PIO mode supported, * to the fastest PIO mode supported,
* if possible for this drive only. * if possible for this drive only.
...@@ -1859,8 +1858,8 @@ int __init ide_setup (char *s) ...@@ -1859,8 +1858,8 @@ int __init ide_setup (char *s)
const char *hd_words[] = { const char *hd_words[] = {
"none", "noprobe", "nowerr", "cdrom", "serialize", "none", "noprobe", "nowerr", "cdrom", "serialize",
"autotune", "noautotune", "slow", "swapdata", "bswap", "autotune", "noautotune", "slow", "swapdata", "bswap",
"flash", "remap", "noremap", "scsi", "biostimings", "flash", "remap", "remap63", "scsi", "biostimings",
"remap63", NULL }; NULL };
unit = s[2] - 'a'; unit = s[2] - 'a';
hw = unit / MAX_DRIVES; hw = unit / MAX_DRIVES;
unit = unit % MAX_DRIVES; unit = unit % MAX_DRIVES;
...@@ -1920,8 +1919,8 @@ int __init ide_setup (char *s) ...@@ -1920,8 +1919,8 @@ int __init ide_setup (char *s)
case -12: /* "remap" */ case -12: /* "remap" */
drive->remap_0_to_1 = 1; drive->remap_0_to_1 = 1;
goto done; goto done;
case -13: /* "noremap" */ case -13: /* "remap63" */
drive->remap_0_to_1 = 2; drive->sect0 = 63;
goto done; goto done;
case -14: /* "scsi" */ case -14: /* "scsi" */
drive->scsi = 1; drive->scsi = 1;
...@@ -1929,9 +1928,6 @@ int __init ide_setup (char *s) ...@@ -1929,9 +1928,6 @@ int __init ide_setup (char *s)
case -15: /* "biostimings" */ case -15: /* "biostimings" */
drive->autotune = IDE_TUNE_BIOS; drive->autotune = IDE_TUNE_BIOS;
goto done; goto done;
case -16: /* "remap63" */
drive->sect0 = 63;
goto done;
case 3: /* cyl,head,sect */ case 3: /* cyl,head,sect */
drive->media = ide_disk; drive->media = ide_disk;
drive->cyl = drive->bios_cyl = vals[0]; drive->cyl = drive->bios_cyl = vals[0];
......
...@@ -720,7 +720,7 @@ typedef struct ide_drive_s { ...@@ -720,7 +720,7 @@ typedef struct ide_drive_s {
unsigned doorlocking : 1; /* for removable only: door lock/unlock works */ unsigned doorlocking : 1; /* for removable only: door lock/unlock works */
unsigned autotune : 3; /* 1=autotune, 2=noautotune, unsigned autotune : 3; /* 1=autotune, 2=noautotune,
3=biostimings, 0=default */ 3=biostimings, 0=default */
unsigned remap_0_to_1 : 2; /* 0=remap if ezdrive, 1=remap, 2=noremap */ unsigned remap_0_to_1 : 1; /* 0=noremap, 1=remap 0->1 (for EZDrive) */
unsigned ata_flash : 1; /* 1=present, 0=default */ unsigned ata_flash : 1; /* 1=present, 0=default */
unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */ unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */
unsigned vdma : 1; /* 1=doing PIO over DMA 0=doing normal DMA */ unsigned vdma : 1; /* 1=doing PIO over DMA 0=doing normal DMA */
......
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