diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:28 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:28 -0400 |
commit | 2787cb8ae5c68a6945eb82ccf96b5f2c4f238323 (patch) | |
tree | 9d2184231c2e36066a33df59303dd9980a6fc99f | |
parent | 0a6e49e9bc1e9698b2a1a529776b928768561a5a (diff) |
ide: add IDE_HFLAG_DTC2278 host flag
Add IDE_HFLAG_DTC2278 host flag and use it instead of ide_dtc2278
chipset type in ide_init_port().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/dtc2278.c | 3 | ||||
-rw-r--r-- | drivers/ide/ide-probe.c | 2 | ||||
-rw-r--r-- | include/linux/ide.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ide/dtc2278.c b/drivers/ide/dtc2278.c index 689b2e493413..c6b138122981 100644 --- a/drivers/ide/dtc2278.c +++ b/drivers/ide/dtc2278.c | |||
@@ -100,7 +100,8 @@ static const struct ide_port_info dtc2278_port_info __initdata = { | |||
100 | IDE_HFLAG_IO_32BIT | | 100 | IDE_HFLAG_IO_32BIT | |
101 | /* disallow ->io_32bit changes */ | 101 | /* disallow ->io_32bit changes */ |
102 | IDE_HFLAG_NO_IO_32BIT | | 102 | IDE_HFLAG_NO_IO_32BIT | |
103 | IDE_HFLAG_NO_DMA, | 103 | IDE_HFLAG_NO_DMA | |
104 | IDE_HFLAG_DTC2278, | ||
104 | .pio_mask = ATA_PIO4, | 105 | .pio_mask = ATA_PIO4, |
105 | }; | 106 | }; |
106 | 107 | ||
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 75b79cc96339..62270f474681 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1061,7 +1061,7 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port, | |||
1061 | hwif->tp_ops = d->tp_ops; | 1061 | hwif->tp_ops = d->tp_ops; |
1062 | 1062 | ||
1063 | /* ->set_pio_mode for DTC2278 is currently limited to port 0 */ | 1063 | /* ->set_pio_mode for DTC2278 is currently limited to port 0 */ |
1064 | if (hwif->chipset != ide_dtc2278 || hwif->channel == 0) | 1064 | if ((hwif->host_flags & IDE_HFLAG_DTC2278) == 0 || hwif->channel == 0) |
1065 | hwif->port_ops = d->port_ops; | 1065 | hwif->port_ops = d->port_ops; |
1066 | 1066 | ||
1067 | hwif->swdma_mask = d->swdma_mask; | 1067 | hwif->swdma_mask = d->swdma_mask; |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 901d323c7bbe..732a05f3de08 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1325,6 +1325,8 @@ enum { | |||
1325 | IDE_HFLAG_ERROR_STOPS_FIFO = (1 << 19), | 1325 | IDE_HFLAG_ERROR_STOPS_FIFO = (1 << 19), |
1326 | /* serialize ports */ | 1326 | /* serialize ports */ |
1327 | IDE_HFLAG_SERIALIZE = (1 << 20), | 1327 | IDE_HFLAG_SERIALIZE = (1 << 20), |
1328 | /* host is DTC2278 */ | ||
1329 | IDE_HFLAG_DTC2278 = (1 << 21), | ||
1328 | /* host is TRM290 */ | 1330 | /* host is TRM290 */ |
1329 | IDE_HFLAG_TRM290 = (1 << 23), | 1331 | IDE_HFLAG_TRM290 = (1 << 23), |
1330 | /* use 32-bit I/O ops */ | 1332 | /* use 32-bit I/O ops */ |