diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:24 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:24 -0500 |
commit | 6679054895f9b1dc676d14637306b297451f1ac0 (patch) | |
tree | cde79b99e193a8508ff5faa33f23e1152fb9bb34 | |
parent | ac4a306537b97fcae5da96bedcf521f6dfdf9753 (diff) |
ide: remove write-only ide_pio_data_t.blacklisted
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/ide-lib.c | 3 | ||||
-rw-r--r-- | include/linux/ide.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index 8237d89eec6e..345456f4c002 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c | |||
@@ -349,7 +349,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p | |||
349 | int use_iordy = 0; | 349 | int use_iordy = 0; |
350 | struct hd_driveid* id = drive->id; | 350 | struct hd_driveid* id = drive->id; |
351 | int overridden = 0; | 351 | int overridden = 0; |
352 | int blacklisted = 0; | ||
353 | 352 | ||
354 | if (mode_wanted != 255) { | 353 | if (mode_wanted != 255) { |
355 | pio_mode = mode_wanted; | 354 | pio_mode = mode_wanted; |
@@ -357,7 +356,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p | |||
357 | pio_mode = 0; | 356 | pio_mode = 0; |
358 | } else if ((pio_mode = ide_scan_pio_blacklist(id->model)) != -1) { | 357 | } else if ((pio_mode = ide_scan_pio_blacklist(id->model)) != -1) { |
359 | overridden = 1; | 358 | overridden = 1; |
360 | blacklisted = 1; | ||
361 | use_iordy = (pio_mode > 2); | 359 | use_iordy = (pio_mode > 2); |
362 | } else { | 360 | } else { |
363 | pio_mode = id->tPIO; | 361 | pio_mode = id->tPIO; |
@@ -409,7 +407,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p | |||
409 | d->cycle_time = cycle_time ? cycle_time : ide_pio_timings[pio_mode].cycle_time; | 407 | d->cycle_time = cycle_time ? cycle_time : ide_pio_timings[pio_mode].cycle_time; |
410 | d->use_iordy = use_iordy; | 408 | d->use_iordy = use_iordy; |
411 | d->overridden = overridden; | 409 | d->overridden = overridden; |
412 | d->blacklisted = blacklisted; | ||
413 | } | 410 | } |
414 | return pio_mode; | 411 | return pio_mode; |
415 | } | 412 | } |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 7b3911034809..59bb58096942 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1367,7 +1367,6 @@ typedef struct ide_pio_data_s { | |||
1367 | u8 pio_mode; | 1367 | u8 pio_mode; |
1368 | u8 use_iordy; | 1368 | u8 use_iordy; |
1369 | u8 overridden; | 1369 | u8 overridden; |
1370 | u8 blacklisted; | ||
1371 | unsigned int cycle_time; | 1370 | unsigned int cycle_time; |
1372 | } ide_pio_data_t; | 1371 | } ide_pio_data_t; |
1373 | 1372 | ||