summaryrefslogtreecommitdiff
path: root/drivers/scsi/megaraid.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2014-02-21 02:20:59 +0400
committerJames Bottomley <JBottomley@Parallels.com>2014-03-27 19:26:31 +0400
commit0f2bb84d2a68448c29d46f9f77a78bb4ed0218db (patch)
tree567416ea674f58eb93e0dc2195cdf6b2483c2ac7 /drivers/scsi/megaraid.h
parentc38c007af04b928b5285da8cc44fbe2f4810e24e (diff)
downloadlinux-0f2bb84d2a68448c29d46f9f77a78bb4ed0218db.tar.xz
[SCSI] megaraid: simplify internal command handling
We don't use the passed in scsi command for anything, so just add a adapter- wide internal status to go along with the internal scb that is used unter int_mtx to pass back the return value and get rid of all the complexities and abuse of the scsi_cmnd structure. This gets rid of the only user of scsi_allocate_command/scsi_free_command, which can now be removed. [jejb: checkpatch fixes] Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Adam Radford <aradford@gmail.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/megaraid.h')
-rw-r--r--drivers/scsi/megaraid.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 4d0ce4e78dfd..508d65e5a518 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -853,10 +853,10 @@ typedef struct {
u8 sglen; /* f/w supported scatter-gather list length */
- unsigned char int_cdb[MAX_COMMAND_SIZE];
scb_t int_scb;
struct mutex int_mtx; /* To synchronize the internal
commands */
+ int int_status; /* status of internal cmd */
struct completion int_waitq; /* wait queue for internal
cmds */
@@ -1004,7 +1004,6 @@ static int mega_del_logdrv(adapter_t *, int);
static int mega_do_del_logdrv(adapter_t *, int);
static void mega_get_max_sgl(adapter_t *);
static int mega_internal_command(adapter_t *, megacmd_t *, mega_passthru *);
-static void mega_internal_done(Scsi_Cmnd *);
static int mega_support_cluster(adapter_t *);
#endif