mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
ide: remove hwif->straight8 flag
All host drivers now either set hwif->mmio or reserve continuous I/O resources so remove no longer needed hwif->straight8 flag and never reached code for 'hwif->straight8 == 0' case. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
951784b667
commit
05230e23cf
2 changed files with 11 additions and 26 deletions
|
@ -251,29 +251,21 @@ static struct resource* hwif_request_region(ide_hwif_t *hwif,
|
|||
int ide_hwif_request_regions(ide_hwif_t *hwif)
|
||||
{
|
||||
unsigned long addr;
|
||||
unsigned int i;
|
||||
|
||||
if (hwif->mmio)
|
||||
return 0;
|
||||
|
||||
addr = hwif->io_ports[IDE_CONTROL_OFFSET];
|
||||
|
||||
if (addr && !hwif_request_region(hwif, addr, 1))
|
||||
goto control_region_busy;
|
||||
hwif->straight8 = 0;
|
||||
|
||||
addr = hwif->io_ports[IDE_DATA_OFFSET];
|
||||
if ((addr | 7) == hwif->io_ports[IDE_STATUS_OFFSET]) {
|
||||
if (!hwif_request_region(hwif, addr, 8))
|
||||
goto data_region_busy;
|
||||
hwif->straight8 = 1;
|
||||
return 0;
|
||||
}
|
||||
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
|
||||
addr = hwif->io_ports[i];
|
||||
if (!hwif_request_region(hwif, addr, 1)) {
|
||||
while (--i)
|
||||
release_region(addr, 1);
|
||||
goto data_region_busy;
|
||||
}
|
||||
}
|
||||
BUG_ON((addr | 7) != hwif->io_ports[IDE_STATUS_OFFSET]);
|
||||
|
||||
if (!hwif_request_region(hwif, addr, 8))
|
||||
goto data_region_busy;
|
||||
|
||||
return 0;
|
||||
|
||||
data_region_busy:
|
||||
|
@ -299,19 +291,13 @@ int ide_hwif_request_regions(ide_hwif_t *hwif)
|
|||
|
||||
void ide_hwif_release_regions(ide_hwif_t *hwif)
|
||||
{
|
||||
u32 i = 0;
|
||||
|
||||
if (hwif->mmio)
|
||||
return;
|
||||
|
||||
if (hwif->io_ports[IDE_CONTROL_OFFSET])
|
||||
release_region(hwif->io_ports[IDE_CONTROL_OFFSET], 1);
|
||||
if (hwif->straight8) {
|
||||
release_region(hwif->io_ports[IDE_DATA_OFFSET], 8);
|
||||
return;
|
||||
}
|
||||
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
|
||||
if (hwif->io_ports[i])
|
||||
release_region(hwif->io_ports[i], 1);
|
||||
|
||||
release_region(hwif->io_ports[IDE_DATA_OFFSET], 8);
|
||||
}
|
||||
|
||||
void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
|
||||
|
|
|
@ -521,7 +521,6 @@ typedef struct hwif_s {
|
|||
unsigned reset : 1; /* reset after probe */
|
||||
unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */
|
||||
unsigned mmio : 1; /* host uses MMIO */
|
||||
unsigned straight8 : 1; /* Alan's straight 8 check */
|
||||
|
||||
struct device gendev;
|
||||
struct device *portdev;
|
||||
|
|
Loading…
Reference in a new issue