This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / megaraid / megaraid_ioctl.h

diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h
index 4bf0430..44584ca 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_ioctl.h
+++ b/drivers/scsi/megaraid/megaraid_ioctl.h
@@ -142,11 +142,9 @@ typedef struct uioc {
 
        caddr_t                 buf_vaddr;
        dma_addr_t              buf_paddr;
-       int8_t                  pool_index;
+       uint8_t                 pool_index;
        uint8_t                 free_buf;
 
-       uint8_t                 timedout;
-
 } __attribute__ ((aligned(1024),packed)) uioc_t;
 
 
@@ -249,7 +247,6 @@ typedef struct mm_dmapool {
  * @pdev               : pci dev; used for allocating dma'ble memory
  * @issue_uioc         : Driver supplied routine to issue uioc_t commands
  *                     : issue_uioc(drvr_data, kioc, ISSUE/ABORT, uioc_done)
- * @quiescent          : flag to indicate if ioctl can be issued to this adp
  * @list               : attach with the global list of adapters
  * @kioc_list          : block of mem for @max_kioc number of kiocs
  * @kioc_pool          : pool of free kiocs
@@ -267,7 +264,7 @@ typedef struct mraid_mmadp {
        uint32_t                unique_id;
        uint32_t                drvr_type;
        unsigned long           drvr_data;
-       uint16_t                timeout;
+       uint8_t                 timeout;
        uint8_t                 max_kioc;
 
        struct pci_dev          *pdev;
@@ -275,7 +272,6 @@ typedef struct mraid_mmadp {
        int(*issue_uioc)(unsigned long, uioc_t *, uint32_t);
 
 /* Maintained by common module */
-       uint32_t                quiescent;
 
        struct list_head        list;
        uioc_t                  *kioc_list;