MIPS: Netlogic: Use chip_data for irq_chip methods

Update mips/netlogic/common/irq.c and mips/pci/msi-xlp.c to use chip_data
to store interrupt controller data pointer. It uses handler_data now,
and that causes errors when an API (like the GPIO subsystem) tries to
use the handler data.

Signed-off-by: Kamlakant Patel <kamlakant.patel@broadcom.com>
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10817/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c
index 5f5d18b0e94d..3660dc67d544 100644
--- a/arch/mips/netlogic/common/irq.c
+++ b/arch/mips/netlogic/common/irq.c
@@ -87,7 +87,7 @@ struct nlm_pic_irq {
 static void xlp_pic_enable(struct irq_data *d)
 {
         unsigned long flags;
-        struct nlm_pic_irq *pd = irq_data_get_irq_handler_data(d);
+        struct nlm_pic_irq *pd = irq_data_get_irq_chip_data(d);
 
         BUG_ON(!pd);
         spin_lock_irqsave(&pd->node->piclock, flags);
@@ -97,7 +97,7 @@ static void xlp_pic_enable(struct irq_data *d)
 
 static void xlp_pic_disable(struct irq_data *d)
 {
-        struct nlm_pic_irq *pd = irq_data_get_irq_handler_data(d);
+        struct nlm_pic_irq *pd = irq_data_get_irq_chip_data(d);
         unsigned long flags;
 
         BUG_ON(!pd);
@@ -108,7 +108,7 @@ static void xlp_pic_disable(struct irq_data *d)
 
 static void xlp_pic_mask_ack(struct irq_data *d)
 {
-        struct nlm_pic_irq *pd = irq_data_get_irq_handler_data(d);
+        struct nlm_pic_irq *pd = irq_data_get_irq_chip_data(d);
 
         clear_c0_eimr(pd->picirq);
         ack_c0_eirr(pd->picirq);
@@ -116,7 +116,7 @@ static void xlp_pic_mask_ack(struct irq_data *d)
 
 static void xlp_pic_unmask(struct irq_data *d)
 {
-        struct nlm_pic_irq *pd = irq_data_get_irq_handler_data(d);
+        struct nlm_pic_irq *pd = irq_data_get_irq_chip_data(d);
 
         BUG_ON(!pd);
 
@@ -193,7 +193,7 @@ void nlm_setup_pic_irq(int node, int picirq, int irq, int irt)
         pic_data->picirq = picirq;
         pic_data->node = nlm_get_node(node);
         irq_set_chip_and_handler(xirq, &xlp_pic, handle_level_irq);
-        irq_set_handler_data(xirq, pic_data);
+        irq_set_chip_data(xirq, pic_data);
 }
 
 void nlm_set_pic_extra_ack(int node, int irq, void (*xack)(struct irq_data *))
@@ -202,7 +202,7 @@ void nlm_set_pic_extra_ack(int node, int irq, void (*xack)(struct irq_data *))
         int xirq;
 
         xirq = nlm_irq_to_xirq(node, irq);
-        pic_data = irq_get_handler_data(xirq);
+        pic_data = irq_get_chip_data(xirq);
         if (WARN_ON(!pic_data))
                 return;
         pic_data->extra_ack = xack;