usb-storage: don't bounce highmem pages

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 8931df5a85fd9e49de0e8b8f399771405168ed06..5cfaf5291db43355dd5df583dbe8e4fd820d8594 100644 (file)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -130,15 +130,6 @@ static int slave_configure(struct scsi_device *sdev)
                min_t(size_t, queue_max_hw_sectors(sdev->request_queue),
                      dma_max_mapping_size(dev) >> SECTOR_SHIFT));
 
-       /*
-        * Some USB host controllers can't do DMA; they have to use PIO.
-        * For such controllers we need to make sure the block layer sets
-        * up bounce buffers in addressable memory.
-        */
-       if (!hcd_uses_dma(bus_to_hcd(us->pusb_dev->bus)) ||
-                       (bus_to_hcd(us->pusb_dev->bus)->localmem_pool != NULL))
-               blk_queue_bounce_limit(sdev->request_queue, BLK_BOUNCE_HIGH);
-
        /*
         * We can't put these settings in slave_alloc() because that gets
         * called before the device type is known.  Consequently these