cciss: simplify scatter gather code

cciss: simplify scatter gather code.
Instead of allocating an array of pointers to a structure
containing an SGDescriptor structure, and two other elements
that aren't really used, just allocate SGDescriptor structs.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 1 insertions, 7 deletions

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 2b07bdacbd12..ac454fdd4d30 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -55,12 +55,6 @@ typedef struct _drive_info_struct
         char device_initialized;     /* indicates whether dev is initialized */
 } drive_info_struct;
 
-struct Cmd_sg_list {
-        SGDescriptor_struct     *sgchain;
-        dma_addr_t              sg_chain_dma;
-        int                     chain_block_size;
-};
-
 struct ctlr_info
 {
         int     ctlr;
@@ -89,7 +83,7 @@ struct ctlr_info
         int     maxsgentries;
         int     chainsize;
         int     max_cmd_sgentries;
-        struct Cmd_sg_list **cmd_sg_list;
+        SGDescriptor_struct **cmd_sg_list;
 
 #       define DOORBELL_INT     0
 #       define PERF_MODE_INT    1