ide: merge ide_hwgroup_t with ide_hwif_t (v2)

[linux-2.6-omap-h63xx.git] / drivers / ide / scc_pata.c

diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 0f48f9dacfa5e003ab307482c06ed3f9b3fdb6e9..e966113fd569d827e7858bc8d1b8f3726f252a65 100644 (file)
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -316,7 +316,7 @@ static void scc_dma_host_set(ide_drive_t *drive, int on)
 static int scc_dma_setup(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = drive->hwif;
-       struct request *rq = HWGROUP(drive)->rq;
+       struct request *rq = hwif->rq;
        unsigned int reading;
        u8 dma_stat;
 
@@ -405,7 +405,7 @@ static int scc_dma_end(ide_drive_t *drive)
                               drive->name);
                        data_loss = 1;
                        if (retry++) {
-                               struct request *rq = HWGROUP(drive)->rq;
+                               struct request *rq = hwif->rq;
                                int unit;
                                /* ERROR_RESET and drive->crc_count are needed
                                 * to reduce DMA transfer mode in retry process.