3 files changed, 15 insertions, 7 deletions

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 7a468254e533..505798f86c36 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -57,8 +57,9 @@ unsigned long probe_irq_on(void)
                          * Some chips need to know about probing in
                          * progress:
                          */
-                        if (desc->irq_data.chip->set_type)
-                                desc->irq_data.chip->set_type(i, IRQ_TYPE_PROBE);
+                        if (desc->irq_data.chip->irq_set_type)
+                                desc->irq_data.chip->irq_set_type(&desc->irq_data,
+                                                         IRQ_TYPE_PROBE);
                         desc->irq_data.chip->irq_startup(&desc->irq_data);
                 }
                 raw_spin_unlock_irq(&desc->lock);
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index df51792d9fd3..b7dd02a99c80 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -376,6 +376,11 @@ static int compat_irq_set_affinity(struct irq_data *data,
         return data->chip->set_affinity(data->irq, dest);
 }
 
+static int compat_irq_set_type(struct irq_data *data, unsigned int type)
+{
+        return data->chip->set_type(data->irq, type);
+}
+
 static void compat_bus_lock(struct irq_data *data)
 {
         data->chip->bus_lock(data->irq);
@@ -444,6 +449,8 @@ void irq_chip_set_defaults(struct irq_chip *chip)
                 chip->irq_eoi = compat_irq_eoi;
         if (chip->set_affinity)
                 chip->irq_set_affinity = compat_irq_set_affinity;
+        if (chip->set_type)
+                chip->irq_set_type = compat_irq_set_type;
 }
 
 static inline void mask_ack_irq(struct irq_desc *desc)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 305a60ff756b..3618362b3d8d 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -430,12 +430,12 @@ void compat_irq_chip_set_default_handler(struct irq_desc *desc)
 }
 
 int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
-                unsigned long flags)
+                      unsigned long flags)
 {
         int ret;
         struct irq_chip *chip = desc->irq_data.chip;
 
-        if (!chip || !chip->set_type) {
+        if (!chip || !chip->irq_set_type) {
                 /*
                  * IRQF_TRIGGER_* but the PIC does not support multiple
                  * flow-types?
@@ -446,11 +446,11 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
         }
 
         /* caller masked out all except trigger mode flags */
-        ret = chip->set_type(irq, flags);
+        ret = chip->irq_set_type(&desc->irq_data, flags);
 
         if (ret)
-                pr_err("setting trigger mode %d for irq %u failed (%pF)\n",
-                                (int)flags, irq, chip->set_type);
+                pr_err("setting trigger mode %lu for irq %u failed (%pF)\n",
+                       flags, irq, chip->irq_set_type);
         else {
                 if (flags & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
                         flags |= IRQ_LEVEL;