ide: kill ide_toggle_bounce

ide_toggle_bounce did select various strange block bounce limits, including
not bouncing at all as soon as an iommu is present in the system.  Given
that the dma_map routines now handle any required bounce buffering except
for ISA DMA, and the ide code already must handle either ISA DMA or highmem
at least for iommu equipped systems we can get rid of the block layer
bounce limit setting entirely.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 54d4d78ca46a672a3461e0e751b6f76ba4213adb..6f344654ef2297020deaad1a6fc81e21ca35b906 100644 (file)
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -180,7 +180,6 @@ EXPORT_SYMBOL_GPL(ide_dma_unmap_sg);
 void ide_dma_off_quietly(ide_drive_t *drive)
 {
        drive->dev_flags &= ~IDE_DFLAG_USING_DMA;
-       ide_toggle_bounce(drive, 0);
 
        drive->hwif->dma_ops->dma_host_set(drive, 0);
 }
@@ -211,7 +210,6 @@ EXPORT_SYMBOL(ide_dma_off);
 void ide_dma_on(ide_drive_t *drive)
 {
        drive->dev_flags |= IDE_DFLAG_USING_DMA;
-       ide_toggle_bounce(drive, 1);
 
        drive->hwif->dma_ops->dma_host_set(drive, 1);
 }

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index e1180fa461969d01bd7581b52e7ba0da84ab7dfe..78cb79eddc8b9f2bb9e491c977b9ae95bae7b992 100644 (file)
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -6,32 +6,6 @@
 #include <linux/ide.h>
 #include <linux/bitops.h>
 
-/**
- *     ide_toggle_bounce       -       handle bounce buffering
- *     @drive: drive to update
- *     @on: on/off boolean
- *
- *     Enable or disable bounce buffering for the device. Drives move
- *     between PIO and DMA and that changes the rules we need.
- */
-
-void ide_toggle_bounce(ide_drive_t *drive, int on)
-{
-       u64 addr = BLK_BOUNCE_HIGH;     /* dma64_addr_t */
-
-       if (!PCI_DMA_BUS_IS_PHYS) {
-               addr = BLK_BOUNCE_ANY;
-       } else if (on && drive->media == ide_disk) {
-               struct device *dev = drive->hwif->dev;
-
-               if (dev && dev->dma_mask)
-                       addr = *dev->dma_mask;
-       }
-
-       if (drive->queue)
-               blk_queue_bounce_limit(drive->queue, addr);
-}
-
 u64 ide_get_lba_addr(struct ide_cmd *cmd, int lba48)
 {
        struct ide_taskfile *tf = &cmd->tf;

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 2019e66eada70d33a6352b254b1d56a9f101bfb4..8d8ed036ca0a255e8f7e777669416d5cd5e32d22 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -805,9 +805,6 @@ static int ide_init_queue(ide_drive_t *drive)
        /* assign drive queue */
        drive->queue = q;
 
-       /* needs drive->queue to be set */
-       ide_toggle_bounce(drive, 1);
-
        return 0;
 }
 

diff --git a/include/linux/ide.h b/include/linux/ide.h
index ca9d34feb5726f55678f36d542cacd9aaed3fd40..11f0dd03a4b4117dcee6889497d089a13ae52839 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1508,8 +1508,6 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
        hwif->hwif_data = data;
 }
 
-extern void ide_toggle_bounce(ide_drive_t *drive, int on);
-
 u64 ide_get_lba_addr(struct ide_cmd *, int);
 u8 ide_dump_status(ide_drive_t *, const char *, u8);