Merge git://git.infradead.org/~dhowells/irq-2.6

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
  IRQ: Typedef the IRQ handler function type
  IRQ: Typedef the IRQ flow handler function type

diff --combined drivers/scsi/qla2xxx/qla_gbl.h
index 990b897,7513810..7da6983
--- 1/drivers/scsi/qla2xxx/qla_gbl.h
--- 2/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@@ -60,7 -60,7 +60,7 @@@ extern int ql2xplogiabsentdevice
  extern int ql2xloginretrycount;
  extern int ql2xfdmienable;
  extern int ql2xallocfwdump;
 -extern int extended_error_logging;
 +extern int qla2_extended_error_logging;
  
  extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);
  
@@@ -217,9 -217,9 +217,9 @@@ qla2x00_set_idma_speed(scsi_qla_host_t 
  /*
   * Global Function Prototypes in qla_isr.c source file.
   */
- extern irqreturn_t qla2100_intr_handler(int, void *, struct pt_regs *);
- extern irqreturn_t qla2300_intr_handler(int, void *, struct pt_regs *);
- extern irqreturn_t qla24xx_intr_handler(int, void *, struct pt_regs *);
+ extern irqreturn_t qla2100_intr_handler(int, void *);
+ extern irqreturn_t qla2300_intr_handler(int, void *);
+ extern irqreturn_t qla24xx_intr_handler(int, void *);
  extern void qla2x00_process_response_queue(struct scsi_qla_host *);
  extern void qla24xx_process_response_queue(struct scsi_qla_host *);
  

diff --combined drivers/scsi/qla4xxx/ql4_glbl.h
index 77a997a,1de0800..2c803ed
--- 1/drivers/scsi/qla4xxx/ql4_glbl.h
--- 2/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@@ -13,7 -13,7 +13,7 @@@ int qla4xxx_send_command_to_isp(struct 
  int qla4xxx_initialize_adapter(struct scsi_qla_host * ha,
                               uint8_t renew_ddb_list);
  int qla4xxx_soft_reset(struct scsi_qla_host *ha);
- irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id, struct pt_regs *regs);
+ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id);
  
  void qla4xxx_free_ddb_list(struct scsi_qla_host * ha);
  void qla4xxx_process_aen(struct scsi_qla_host * ha, uint8_t process_aen);
@@@ -72,7 -72,7 +72,7 @@@ int qla4xxx_reinitialize_ddb_list(struc
  int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha,
                                uint32_t fw_ddb_index, uint32_t state);
  
 -extern int extended_error_logging;
 +extern int qla4_extended_error_logging;
  extern int ql4xdiscoverywait;
  extern int ql4xdontresethba;
  #endif                                /* _QLA4x_GBL_H */