[SCSI] add can_queue to host parameters

[linux-2.6-omap-h63xx.git] / drivers / scsi / aic94xx / aic94xx_hwi.c

diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c
index a24201351108117b23e8fbee686a3cdb2e01eb31..3c2d7a379931af09bb9925eef434a81c96607265 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_hwi.c
+++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
@@ -267,7 +267,7 @@ static int asd_init_dl(struct asd_ha_struct *asd_ha)
 
 /* ---------- EDB and ESCB init ---------- */
 
-static int asd_alloc_edbs(struct asd_ha_struct *asd_ha, unsigned int gfp_flags)
+static int asd_alloc_edbs(struct asd_ha_struct *asd_ha, gfp_t gfp_flags)
 {
        struct asd_seq_data *seq = &asd_ha->seq;
        int i;
@@ -298,7 +298,7 @@ Err_unroll:
 }
 
 static int asd_alloc_escbs(struct asd_ha_struct *asd_ha,
-                          unsigned int gfp_flags)
+                          gfp_t gfp_flags)
 {
        struct asd_seq_data *seq = &asd_ha->seq;
        struct asd_ascb *escb;
@@ -996,11 +996,10 @@ static inline void asd_hst_pcix_isr(struct asd_ha_struct *asd_ha)
  * asd_hw_isr -- host adapter interrupt service routine
  * @irq: ignored
  * @dev_id: pointer to host adapter structure
- * @regs: ignored
  *
  * The ISR processes done list entries and level 3 error handling.
  */
-irqreturn_t asd_hw_isr(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t asd_hw_isr(int irq, void *dev_id)
 {
        struct asd_ha_struct *asd_ha = dev_id;
        u32 chimint = asd_read_reg_dword(asd_ha, CHIMINT);
@@ -1028,7 +1027,7 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id, struct pt_regs *regs)
 /* ---------- SCB handling ---------- */
 
 static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha,
-                                             unsigned int gfp_flags)
+                                             gfp_t gfp_flags)
 {
        extern kmem_cache_t *asd_ascb_cache;
        struct asd_seq_data *seq = &asd_ha->seq;
@@ -1086,7 +1085,7 @@ undo:
  */
 struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct
                                     *asd_ha, int *num,
-                                    unsigned int gfp_flags)
+                                    gfp_t gfp_flags)
 {
        struct asd_ascb *first = NULL;