Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84feb166 authored by Bart Van Assche's avatar Bart Van Assche Committed by James Bottomley
Browse files

[SCSI] Change return type of scsi_queue_insert() into void 



The return value of scsi_queue_insert() is ignored by all its
callers, hence change the return type of this function into
void.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Reviewed-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 940f5d47

drivers/scsi/scsi_lib.c

+3 −5
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void scsi_unprep_request(struct request *req) 
 * for a requeue after completion, which should only occur in this

 * file.

 */

static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)

static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)

{

	struct Scsi_Host *host = cmd->device->host;

	struct scsi_device *device = cmd->device;
@@ -162,8 +162,6 @@ static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy) 
	spin_unlock_irqrestore(q->queue_lock, flags);



	kblockd_schedule_work(q, &device->requeue_work);



	return 0;

}



/*
@@ -185,9 +183,9 @@ static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy) 
 * Notes:       This could be called either from an interrupt context or a

 *              normal process context.

 */

int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)

void scsi_queue_insert(struct scsi_cmnd *cmd, int reason)

{

	return __scsi_queue_insert(cmd, reason, 1);

	__scsi_queue_insert(cmd, reason, 1);

}

/**

 * scsi_execute - insert request and wait for the result

drivers/scsi/scsi_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd); 
/* scsi_lib.c */

extern int scsi_maybe_unblock_host(struct scsi_device *sdev);

extern void scsi_device_unbusy(struct scsi_device *sdev);

extern int scsi_queue_insert(struct scsi_cmnd *cmd, int reason);

extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason);

extern void scsi_next_command(struct scsi_cmnd *cmd);

extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);

extern void scsi_run_host_queues(struct Scsi_Host *shost);