hpsa: remove unused fields from struct ctlr_info

The fields "major", "max_outstanding", and "usage_count"
of struct ctlr_info were not used for anything.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Reviewed-by: Mike Miller <michael.miller@canonical.com>
Reviewed-by: Webb Scales <webb.scales@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 5858600bfe593255592dd009fcdb02b82463f04d..13c53fa410ea64351cadf3aaa2b00617aacd422b 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5488,8 +5488,6 @@ static void start_io(struct ctlr_info *h)
                 * condition.
                 */
                h->commands_outstanding++;
-               if (h->commands_outstanding > h->max_outstanding)
-                       h->max_outstanding = h->commands_outstanding;
 
                /* Tell the controller execute command */
                spin_unlock_irqrestore(&h->lock, flags);

diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 1e3cf33a82cf12750fa9336e087774dcb7c5becd..75414a0ac6576c4328cbf725af875376d6441afb 100644 (file)
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -116,11 +116,8 @@ struct ctlr_info {
        int     nr_cmds; /* Number of commands allowed on this controller */
        struct CfgTable __iomem *cfgtable;
        int     interrupts_enabled;
-       int     major;
        int     max_commands;
        int     commands_outstanding;
-       int     max_outstanding; /* Debug */
-       int     usage_count;  /* number of opens all all minor devices */
 #      define PERF_MODE_INT    0
 #      define DOORBELL_INT     1
 #      define SIMPLE_MODE_INT  2