Merge tag 'iwlwifi-for-kalle-2015-07-30' of https://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / block / mtip32xx / mtip32xx.h

diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
index ba1b31ee22ec7e72e7649d743e5a25f2e22a3941..3274784008ebc9ef4fcfe65b47ee1bc0306223f9 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@ -142,7 +142,6 @@ enum {
        MTIP_PF_SVC_THD_ACTIVE_BIT  = 4,
        MTIP_PF_ISSUE_CMDS_BIT      = 5,
        MTIP_PF_REBUILD_BIT         = 6,
-       MTIP_PF_SR_CLEANUP_BIT      = 7,
        MTIP_PF_SVC_THD_STOP_BIT    = 8,
 
        /* below are bit numbers in 'dd_flag' defined in driver_data */
@@ -150,7 +149,6 @@ enum {
        MTIP_DDF_REMOVE_PENDING_BIT = 1,
        MTIP_DDF_OVER_TEMP_BIT      = 2,
        MTIP_DDF_WRITE_PROTECT_BIT  = 3,
-       MTIP_DDF_REMOVE_DONE_BIT    = 4,
        MTIP_DDF_CLEANUP_BIT        = 5,
        MTIP_DDF_RESUME_BIT         = 6,
        MTIP_DDF_INIT_DONE_BIT      = 7,
@@ -412,19 +410,13 @@ struct mtip_port {
         * by the DMA when the driver issues internal commands.
         */
        dma_addr_t sector_buffer_dma;
-       /*
-        * Bit significant, used to determine if a command slot has
-        * been allocated. i.e. the slot is in use.  Bits are cleared
-        * when the command slot and all associated data structures
-        * are no longer needed.
-        */
+
        u16 *log_buf;
        dma_addr_t log_buf_dma;
 
        u8 *smart_buf;
        dma_addr_t smart_buf_dma;
 
-       unsigned long allocated[SLOTBITS_IN_LONGS];
        /*
         * used to queue commands when an internal command is in progress
         * or error handling is active