diff options
Diffstat (limited to 'drivers/ide/pci/trm290.c')
-rw-r--r-- | drivers/ide/pci/trm290.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index d9ebb698953a..de750f7a43e9 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
@@ -131,14 +131,12 @@ | |||
131 | #include <linux/types.h> | 131 | #include <linux/types.h> |
132 | #include <linux/module.h> | 132 | #include <linux/module.h> |
133 | #include <linux/kernel.h> | 133 | #include <linux/kernel.h> |
134 | #include <linux/mm.h> | ||
135 | #include <linux/ioport.h> | 134 | #include <linux/ioport.h> |
136 | #include <linux/interrupt.h> | 135 | #include <linux/interrupt.h> |
137 | #include <linux/blkdev.h> | 136 | #include <linux/blkdev.h> |
138 | #include <linux/init.h> | 137 | #include <linux/init.h> |
139 | #include <linux/hdreg.h> | 138 | #include <linux/hdreg.h> |
140 | #include <linux/pci.h> | 139 | #include <linux/pci.h> |
141 | #include <linux/delay.h> | ||
142 | #include <linux/ide.h> | 140 | #include <linux/ide.h> |
143 | 141 | ||
144 | #include <asm/io.h> | 142 | #include <asm/io.h> |
@@ -179,10 +177,7 @@ static void trm290_selectproc (ide_drive_t *drive) | |||
179 | 177 | ||
180 | static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command) | 178 | static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command) |
181 | { | 179 | { |
182 | BUG_ON(HWGROUP(drive)->handler != NULL); /* paranoia check */ | 180 | ide_execute_command(drive, command, &ide_dma_intr, WAIT_CMD, NULL); |
183 | ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL); | ||
184 | /* issue cmd to drive */ | ||
185 | outb(command, IDE_COMMAND_REG); | ||
186 | } | 181 | } |
187 | 182 | ||
188 | static int trm290_dma_setup(ide_drive_t *drive) | 183 | static int trm290_dma_setup(ide_drive_t *drive) |