diff options
Diffstat (limited to 'drivers/scsi/53c700.c')
-rw-r--r-- | drivers/scsi/53c700.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index f5a9addb7050..80dc3ac12cde 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c | |||
@@ -117,6 +117,7 @@ | |||
117 | #include <linux/kernel.h> | 117 | #include <linux/kernel.h> |
118 | #include <linux/types.h> | 118 | #include <linux/types.h> |
119 | #include <linux/string.h> | 119 | #include <linux/string.h> |
120 | #include <linux/slab.h> | ||
120 | #include <linux/ioport.h> | 121 | #include <linux/ioport.h> |
121 | #include <linux/delay.h> | 122 | #include <linux/delay.h> |
122 | #include <linux/spinlock.h> | 123 | #include <linux/spinlock.h> |
@@ -175,7 +176,7 @@ STATIC void NCR_700_chip_reset(struct Scsi_Host *host); | |||
175 | STATIC int NCR_700_slave_alloc(struct scsi_device *SDpnt); | 176 | STATIC int NCR_700_slave_alloc(struct scsi_device *SDpnt); |
176 | STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt); | 177 | STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt); |
177 | STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt); | 178 | STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt); |
178 | static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth); | 179 | static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth, int reason); |
179 | static int NCR_700_change_queue_type(struct scsi_device *SDpnt, int depth); | 180 | static int NCR_700_change_queue_type(struct scsi_device *SDpnt, int depth); |
180 | 181 | ||
181 | STATIC struct device_attribute *NCR_700_dev_attrs[]; | 182 | STATIC struct device_attribute *NCR_700_dev_attrs[]; |
@@ -1491,7 +1492,7 @@ NCR_700_intr(int irq, void *dev_id) | |||
1491 | unsigned long flags; | 1492 | unsigned long flags; |
1492 | int handled = 0; | 1493 | int handled = 0; |
1493 | 1494 | ||
1494 | /* Use the host lock to serialise acess to the 53c700 | 1495 | /* Use the host lock to serialise access to the 53c700 |
1495 | * hardware. Note: In future, we may need to take the queue | 1496 | * hardware. Note: In future, we may need to take the queue |
1496 | * lock to enter the done routines. When that happens, we | 1497 | * lock to enter the done routines. When that happens, we |
1497 | * need to ensure that for this driver, the host lock and the | 1498 | * need to ensure that for this driver, the host lock and the |
@@ -2082,8 +2083,11 @@ NCR_700_slave_destroy(struct scsi_device *SDp) | |||
2082 | } | 2083 | } |
2083 | 2084 | ||
2084 | static int | 2085 | static int |
2085 | NCR_700_change_queue_depth(struct scsi_device *SDp, int depth) | 2086 | NCR_700_change_queue_depth(struct scsi_device *SDp, int depth, int reason) |
2086 | { | 2087 | { |
2088 | if (reason != SCSI_QDEPTH_DEFAULT) | ||
2089 | return -EOPNOTSUPP; | ||
2090 | |||
2087 | if (depth > NCR_700_MAX_TAGS) | 2091 | if (depth > NCR_700_MAX_TAGS) |
2088 | depth = NCR_700_MAX_TAGS; | 2092 | depth = NCR_700_MAX_TAGS; |
2089 | 2093 | ||