Merge tag 'xfs-4.18-merge-10' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux.git] / drivers / ide / ide-probe.c

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 2019e66eada70d33a6352b254b1d56a9f101bfb4..56d7bc228cb31483b71a6a2a7fb2733b915a27e6 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -796,8 +796,7 @@ static int ide_init_queue(ide_drive_t *drive)
         * This will be fixed once we teach pci_map_sg() about our boundary
         * requirements, hopefully soon. *FIXME*
         */
-       if (!PCI_DMA_BUS_IS_PHYS)
-               max_sg_entries >>= 1;
+       max_sg_entries >>= 1;
 #endif /* CONFIG_PCI */
 
        blk_queue_max_segments(q, max_sg_entries);
@@ -805,9 +804,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;
 }