diff options
Diffstat (limited to 'drivers/ide/mips/au1xxx-ide.c')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index e0cf5e2dbab7..1a6c27b32498 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -48,8 +48,6 @@ | |||
48 | 48 | ||
49 | static _auide_hwif auide_hwif; | 49 | static _auide_hwif auide_hwif; |
50 | 50 | ||
51 | static int auide_ddma_init(_auide_hwif *auide); | ||
52 | |||
53 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA) | 51 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA) |
54 | 52 | ||
55 | void auide_insw(unsigned long port, void *addr, u32 count) | 53 | void auide_insw(unsigned long port, void *addr, u32 count) |
@@ -88,6 +86,17 @@ void auide_outsw(unsigned long port, void *addr, u32 count) | |||
88 | ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp); | 86 | ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp); |
89 | } | 87 | } |
90 | 88 | ||
89 | static void au1xxx_input_data(ide_drive_t *drive, struct request *rq, | ||
90 | void *buf, unsigned int len) | ||
91 | { | ||
92 | auide_insw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2); | ||
93 | } | ||
94 | |||
95 | static void au1xxx_output_data(ide_drive_t *drive, struct request *rq, | ||
96 | void *buf, unsigned int len) | ||
97 | { | ||
98 | auide_outsw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2); | ||
99 | } | ||
91 | #endif | 100 | #endif |
92 | 101 | ||
93 | static void au1xxx_set_pio_mode(ide_drive_t *drive, const u8 pio) | 102 | static void au1xxx_set_pio_mode(ide_drive_t *drive, const u8 pio) |
@@ -598,8 +607,8 @@ static int au_ide_probe(struct device *dev) | |||
598 | */ | 607 | */ |
599 | 608 | ||
600 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA | 609 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA |
601 | hwif->INSW = auide_insw; | 610 | hwif->input_data = au1xxx_input_data; |
602 | hwif->OUTSW = auide_outsw; | 611 | hwif->output_data = au1xxx_output_data; |
603 | #endif | 612 | #endif |
604 | hwif->select_data = 0; /* no chipset-specific code */ | 613 | hwif->select_data = 0; /* no chipset-specific code */ |
605 | hwif->config_data = 0; /* no chipset-specific code */ | 614 | hwif->config_data = 0; /* no chipset-specific code */ |