drivers/block/floppy.c: remove [U]CLEARF, [U]SETF, and [U]TESTF macros

[pandora-kernel.git] / drivers / block / cciss.h

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 1d95db2..c5d4111 100644 (file)
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -55,18 +55,12 @@ 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;
        char    devname[8];
        char    *product_name;
-       char    firm_ver[4]; // Firmware version 
+       char    firm_ver[4]; /* Firmware version */
        struct pci_dev *pdev;
        __u32   board_id;
        void __iomem *vaddr;
@@ -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
@@ -103,7 +97,7 @@ struct ctlr_info
        BYTE    cciss_write;
        BYTE    cciss_read_capacity;
 
-       // information about each logical volume
+       /* information about each logical volume */
        drive_info_struct *drv[CISS_MAX_LUN];
 
        struct access_method access;
@@ -116,7 +110,7 @@ struct ctlr_info
        unsigned int maxSG;
        spinlock_t lock;
 
-       //* pointers to command and error info pool */ 
+       /* pointers to command and error info pool */
        CommandList_struct      *cmd_pool;
        dma_addr_t              cmd_pool_dhandle; 
        ErrorInfo_struct        *errinfo_pool;
@@ -134,12 +128,10 @@ struct ctlr_info
        */
        int                     next_to_run;
 
-       // Disk structures we need to pass back
+       /* Disk structures we need to pass back */
        struct gendisk   *gendisk[CISS_MAX_LUN];
 #ifdef CONFIG_CISS_SCSI_TAPE
-       void *scsi_ctlr; /* ptr to structure containing scsi related stuff */
-       /* list of block side commands the scsi error handling sucked up */
-       /* and saved for later processing */
+       struct cciss_scsi_adapter_data_t *scsi_ctlr;
 #endif
        unsigned char alive;
        struct list_head scan_list;
@@ -315,4 +307,3 @@ struct board_type {
 #define CCISS_LOCK(i)  (&hba[i]->lock)
 
 #endif /* CCISS_H */
-