diff options
author | Christoph Hellwig <hch@infradead.org> | 2014-02-20 17:20:59 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-03-27 11:26:31 -0400 |
commit | 0f2bb84d2a68448c29d46f9f77a78bb4ed0218db (patch) | |
tree | 567416ea674f58eb93e0dc2195cdf6b2483c2ac7 /drivers/scsi/megaraid.h | |
parent | c38c007af04b928b5285da8cc44fbe2f4810e24e (diff) |
[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.h | 3 |
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 { | |||
853 | 853 | ||
854 | u8 sglen; /* f/w supported scatter-gather list length */ | 854 | u8 sglen; /* f/w supported scatter-gather list length */ |
855 | 855 | ||
856 | unsigned char int_cdb[MAX_COMMAND_SIZE]; | ||
857 | scb_t int_scb; | 856 | scb_t int_scb; |
858 | struct mutex int_mtx; /* To synchronize the internal | 857 | struct mutex int_mtx; /* To synchronize the internal |
859 | commands */ | 858 | commands */ |
859 | int int_status; /* status of internal cmd */ | ||
860 | struct completion int_waitq; /* wait queue for internal | 860 | struct completion int_waitq; /* wait queue for internal |
861 | cmds */ | 861 | cmds */ |
862 | 862 | ||
@@ -1004,7 +1004,6 @@ static int mega_del_logdrv(adapter_t *, int); | |||
1004 | static int mega_do_del_logdrv(adapter_t *, int); | 1004 | static int mega_do_del_logdrv(adapter_t *, int); |
1005 | static void mega_get_max_sgl(adapter_t *); | 1005 | static void mega_get_max_sgl(adapter_t *); |
1006 | static int mega_internal_command(adapter_t *, megacmd_t *, mega_passthru *); | 1006 | static int mega_internal_command(adapter_t *, megacmd_t *, mega_passthru *); |
1007 | static void mega_internal_done(Scsi_Cmnd *); | ||
1008 | static int mega_support_cluster(adapter_t *); | 1007 | static int mega_support_cluster(adapter_t *); |
1009 | #endif | 1008 | #endif |
1010 | 1009 | ||