Messages in this thread Patch in this message | | | Date | Tue, 16 Apr 2002 18:46:08 -0400 | From | Brian Gerst <> | Subject | Re: [PATCH] 2.5.8 IDE 36 |
| |
Martin Dalecki wrote: > Tue Apr 16 01:02:47 CEST 2002 ide-clean-36 > > - Consolidate ide_choose_drive() and choose_drive() in to one function. > > - Remove sector data byteswpapping support. Byte-swapping the data is > supported > on the file-system level where applicable. Byte-swapped interfaces are > supported on a lower level anyway. And finally it was used > inconsistently. > > - Eliminate taskfile_input_data() and taskfile_output_data(). This > allowed us > to split up ideproc and eliminate the ugly action switch as well as the > corresponding defines.
There is a typo in the cris ide driver ata_write value. Also, e100_ideproc is now dead and can be removed. Patch attached (untested, but obvious).
--
Brian Gerst diff -urN linux-ide/arch/cris/drivers/ide.c linux/arch/cris/drivers/ide.c --- linux-ide/arch/cris/drivers/ide.c Tue Apr 16 18:37:43 2002 +++ linux/arch/cris/drivers/ide.c Tue Apr 16 18:40:18 2002 @@ -192,8 +192,6 @@ #define ATA_PIO0_HOLD 4 static int e100_dmaproc (ide_dma_action_t func, ide_drive_t *drive); -static void e100_ideproc (ide_ide_action_t func, ide_drive_t *drive, - void *buffer, unsigned int length); /* * good_dma_drives() lists the model names (from "hdparm -i") @@ -280,7 +278,7 @@ hwif->tuneproc = &tune_e100_ide; hwif->dmaproc = &e100_dmaproc; hwif->ata_read = e100_ide_input_data; - hwif->ata_write = e100_ide_input_data; + hwif->ata_write = e100_ide_output_data; hwif->atapi_read = e100_atapi_read; hwif->atapi_write = e100_atapi_write; } @@ -560,32 +558,6 @@ e100_atapi_write(drive, buffer, wcount << 2); } -/* - * The multiplexor for ide_xxxput_data and atapi calls - */ -static void -e100_ideproc (ide_ide_action_t func, ide_drive_t *drive, - void *buffer, unsigned int length) -{ - switch (func) { - case ideproc_ide_input_data: - e100_ide_input_data(drive, buffer, length); - break; - case ideproc_ide_output_data: - e100_ide_input_data(drive, buffer, length); - break; - case ideproc_atapi_read: - e100_atapi_read(drive, buffer, length); - break; - case ideproc_atapi_write: - e100_atapi_write(drive, buffer, length); - break; - default: - printk("e100_ideproc: unsupported func %d!\n", func); - break; - } -} - /* we only have one DMA channel on the chip for ATA, so we can keep these statically */ static etrax_dma_descr ata_descrs[MAX_DMA_DESCRS]; static unsigned int ata_tot_size; | |