scsi: depend on !HIGHMEM for not highmem capable drivers

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 03e71e3d5e5b34fd580dcad9e824f5745eaa2969..3a5b65d8651224e02a84b639c4fc387afa257ac9 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -390,7 +390,7 @@ config SCSI_ACARD
 
 config SCSI_AHA152X
        tristate "Adaptec AHA152X/2825 support"
-       depends on ISA && SCSI
+       depends on ISA && SCSI && !HIGHMEM
        select SCSI_SPI_ATTRS
        select CHECK_SIGNATURE
        help
@@ -781,7 +781,7 @@ config SCSI_INIA100
 
 config SCSI_PPA
        tristate "IOMEGA parallel port (ppa - older drives)"
-       depends on SCSI && PARPORT_PC
+       depends on SCSI && PARPORT_PC && !HIGHMEM
        help
          This driver supports older versions of IOMEGA's parallel port ZIP
          drive (a 100 MB removable media device).
@@ -808,7 +808,7 @@ config SCSI_PPA
 
 config SCSI_IMM
        tristate "IOMEGA parallel port (imm - newer drives)"
-       depends on SCSI && PARPORT_PC
+       depends on SCSI && PARPORT_PC && !HIGHMEM
        help
          This driver supports newer versions of IOMEGA's parallel port ZIP
          drive (a 100 MB removable media device).

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index caeebfb67149981a132c468bd56a9f8d35b12bce..744fc37d62deb7a274bcb80abbf9c4766f024fcc 100644 (file)
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -2940,12 +2940,6 @@ static int aha152x_show_info(struct seq_file *m, struct Scsi_Host *shpnt)
        return 0;
 }
 
-static int aha152x_adjust_queue(struct scsi_device *device)
-{
-       blk_queue_bounce_limit(device->request_queue, BLK_BOUNCE_HIGH);
-       return 0;
-}
-
 static struct scsi_host_template aha152x_driver_template = {
        .module                         = THIS_MODULE,
        .name                           = AHA152X_REVID,
@@ -2961,7 +2955,6 @@ static struct scsi_host_template aha152x_driver_template = {
        .this_id                        = 7,
        .sg_tablesize                   = SG_ALL,
        .dma_boundary                   = PAGE_SIZE - 1,
-       .slave_alloc                    = aha152x_adjust_queue,
        .cmd_size                       = sizeof(struct aha152x_cmd_priv),
 };
 

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 7a499d621c2582ae12e930b3f68b12546cfa5579..271f69ce7983fe9a5e8fd7a0c563dc794ea2587d 100644 (file)
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -1086,16 +1086,6 @@ static int device_check(imm_struct *dev)
        return -ENODEV;
 }
 
-/*
- * imm cannot deal with highmem, so this causes all IO pages for this host
- * to reside in low memory (hence mapped)
- */
-static int imm_adjust_queue(struct scsi_device *device)
-{
-       blk_queue_bounce_limit(device->request_queue, BLK_BOUNCE_HIGH);
-       return 0;
-}
-
 static struct scsi_host_template imm_template = {
        .module                 = THIS_MODULE,
        .proc_name              = "imm",
@@ -1109,7 +1099,6 @@ static struct scsi_host_template imm_template = {
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,
        .can_queue              = 1,
-       .slave_alloc            = imm_adjust_queue,
        .cmd_size               = sizeof(struct scsi_pointer),
 };
 

diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index c6c1bc60822417461feffb83c639ed71353244cb..ef4aa78c86acad01baaf8b67d4d2eb86cf1a57c3 100644 (file)
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -966,12 +966,6 @@ second_pass:
        return -ENODEV;
 }
 
-static int ppa_adjust_queue(struct scsi_device *device)
-{
-       blk_queue_bounce_limit(device->request_queue, BLK_BOUNCE_HIGH);
-       return 0;
-}
-
 static struct scsi_host_template ppa_template = {
        .module                 = THIS_MODULE,
        .proc_name              = "ppa",
@@ -985,7 +979,6 @@ static struct scsi_host_template ppa_template = {
        .this_id                = -1,
        .sg_tablesize           = SG_ALL,
        .can_queue              = 1,
-       .slave_alloc            = ppa_adjust_queue,
        .cmd_size               = sizeof(struct scsi_pointer),
 };