2 files changed, 8 insertions, 8 deletions

diff --git a/include/asm-powerpc/hw_irq.h b/include/asm-powerpc/hw_irq.h
index ce0f7db63c16..a27ed3feb315 100644
--- a/include/asm-powerpc/hw_irq.h
+++ b/include/asm-powerpc/hw_irq.h
@@ -86,20 +86,20 @@ static inline void local_irq_save_ptr(unsigned long *flags)
 #define mask_irq(irq)                                           \
         ({                                                      \
                 irq_desc_t *desc = get_irq_desc(irq);           \
-                if (desc->handler && desc->handler->disable)    \
-                        desc->handler->disable(irq);            \
+                if (desc->chip && desc->chip->disable)  \
+                        desc->chip->disable(irq);               \
         })
 #define unmask_irq(irq)                                         \
         ({                                                      \
                 irq_desc_t *desc = get_irq_desc(irq);           \
-                if (desc->handler && desc->handler->enable)     \
-                        desc->handler->enable(irq);             \
+                if (desc->chip && desc->chip->enable)   \
+                        desc->chip->enable(irq);                \
         })
 #define ack_irq(irq)                                            \
         ({                                                      \
                 irq_desc_t *desc = get_irq_desc(irq);           \
-                if (desc->handler && desc->handler->ack)        \
-                        desc->handler->ack(irq);                \
+                if (desc->chip && desc->chip->ack)      \
+                        desc->chip->ack(irq);           \
         })
 
 /* Should we handle this via lost interrupts and IPIs or should we don't care like
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 676e00dfb21a..9597a6904239 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -69,8 +69,8 @@ typedef struct hw_interrupt_type  hw_irq_controller;
  * Pad this out to 32 bytes for cache and indexing reasons.
  */
 typedef struct irq_desc {
-        hw_irq_controller *handler;
-        void *handler_data;
+        hw_irq_controller *chip;
+        void *chip_data;
         struct irqaction *action;       /* IRQ action list */
         unsigned int status;            /* IRQ status */
         unsigned int depth;             /* nested irq disables */