aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/scsi_lib.c8
-rw-r--r--drivers/scsi/scsi_priv.h2
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0e52ff035135..8af6a6497c4f 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -109,7 +109,7 @@ static void scsi_unprep_request(struct request *req)
109 * for a requeue after completion, which should only occur in this 109 * for a requeue after completion, which should only occur in this
110 * file. 110 * file.
111 */ 111 */
112static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy) 112static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
113{ 113{
114 struct Scsi_Host *host = cmd->device->host; 114 struct Scsi_Host *host = cmd->device->host;
115 struct scsi_device *device = cmd->device; 115 struct scsi_device *device = cmd->device;
@@ -162,8 +162,6 @@ static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
162 spin_unlock_irqrestore(q->queue_lock, flags); 162 spin_unlock_irqrestore(q->queue_lock, flags);
163 163
164 kblockd_schedule_work(q, &device->requeue_work); 164 kblockd_schedule_work(q, &device->requeue_work);
165
166 return 0;
167} 165}
168 166
169/* 167/*
@@ -185,9 +183,9 @@ static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
185 * Notes: This could be called either from an interrupt context or a 183 * Notes: This could be called either from an interrupt context or a
186 * normal process context. 184 * normal process context.
187 */ 185 */
188int scsi_queue_insert(struct scsi_cmnd *cmd, int reason) 186void scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
189{ 187{
190 return __scsi_queue_insert(cmd, reason, 1); 188 __scsi_queue_insert(cmd, reason, 1);
191} 189}
192/** 190/**
193 * scsi_execute - insert request and wait for the result 191 * scsi_execute - insert request and wait for the result
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 291db6effffb..13d74da5dfab 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -80,7 +80,7 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd);
80/* scsi_lib.c */ 80/* scsi_lib.c */
81extern int scsi_maybe_unblock_host(struct scsi_device *sdev); 81extern int scsi_maybe_unblock_host(struct scsi_device *sdev);
82extern void scsi_device_unbusy(struct scsi_device *sdev); 82extern void scsi_device_unbusy(struct scsi_device *sdev);
83extern int scsi_queue_insert(struct scsi_cmnd *cmd, int reason); 83extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason);
84extern void scsi_next_command(struct scsi_cmnd *cmd); 84extern void scsi_next_command(struct scsi_cmnd *cmd);
85extern void scsi_io_completion(struct scsi_cmnd *, unsigned int); 85extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);
86extern void scsi_run_host_queues(struct Scsi_Host *shost); 86extern void scsi_run_host_queues(struct Scsi_Host *shost);