diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-19 19:11:58 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-19 19:11:58 -0400 |
commit | 6a824c92db4d606c324272c4eed366fb71672440 (patch) | |
tree | 72b398062fd582b85507b665120f0a5315548eaf /include/linux/ide.h | |
parent | 2134758d2a5429325cee4d4ce8959af5314eeba1 (diff) |
ide: remove ide_find_best_pio_mode()
* Add ->host_flags to ide_hwif_t to store ide_pci_device_t.host_flags,
assign it in setup-pci.c:ide_pci_setup_ports().
* Add IDE_HFLAG_PIO_NO_{BLACKLIST,DOWNGRADE} to ide_pci_device_t.host_flags
and teach ide_get_best_pio_mode() about them. Also remove needless
!drive->id check while at it (drive->id is always present).
* Convert amd74xx, via82cxxx and ide-timing.h to use ide_get_best_pio_mode()
and then remove no longer needed ide_find_best_pio_mode().
There should be no functionality changes caused by this patch.
Acked-by: Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 14a87f619d17..9f72f6e0c954 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -681,6 +681,8 @@ typedef struct hwif_s { | |||
681 | u8 straight8; /* Alan's straight 8 check */ | 681 | u8 straight8; /* Alan's straight 8 check */ |
682 | u8 bus_state; /* power state of the IDE bus */ | 682 | u8 bus_state; /* power state of the IDE bus */ |
683 | 683 | ||
684 | u8 host_flags; | ||
685 | |||
684 | u8 atapi_dma; /* host supports atapi_dma */ | 686 | u8 atapi_dma; /* host supports atapi_dma */ |
685 | u8 ultra_mask; | 687 | u8 ultra_mask; |
686 | u8 mwdma_mask; | 688 | u8 mwdma_mask; |
@@ -1245,7 +1247,12 @@ typedef struct ide_pci_enablebit_s { | |||
1245 | enum { | 1247 | enum { |
1246 | /* Uses ISA control ports not PCI ones. */ | 1248 | /* Uses ISA control ports not PCI ones. */ |
1247 | IDE_HFLAG_ISA_PORTS = (1 << 0), | 1249 | IDE_HFLAG_ISA_PORTS = (1 << 0), |
1250 | /* single port device */ | ||
1248 | IDE_HFLAG_SINGLE = (1 << 1), | 1251 | IDE_HFLAG_SINGLE = (1 << 1), |
1252 | /* don't use legacy PIO blacklist */ | ||
1253 | IDE_HFLAG_PIO_NO_BLACKLIST = (1 << 2), | ||
1254 | /* don't use conservative PIO "downgrade" */ | ||
1255 | IDE_HFLAG_PIO_NO_DOWNGRADE = (1 << 3), | ||
1249 | }; | 1256 | }; |
1250 | 1257 | ||
1251 | typedef struct ide_pci_device_s { | 1258 | typedef struct ide_pci_device_s { |