5 files changed, 17 insertions, 33 deletions

diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index faa8fb8f2b8f..fa41ff799533 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -123,7 +123,6 @@ static struct i2c_adapter parport_adapter = {
 
 /* SMBus alert support */
 static struct i2c_smbus_alert_setup alert_data = {
-        .alert_edge_triggered   = 1,
 };
 static struct i2c_client *ara;
 static struct lineop parport_ctrl_irq = {
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index a8e54df4aed6..319209a07353 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -237,7 +237,6 @@ static void i2c_parport_attach(struct parport *port)
 
         /* Setup SMBus alert if supported */
         if (adapter_parm[type].smbus_alert) {
-                adapter->alert_data.alert_edge_triggered = 1;
                 adapter->ara = i2c_setup_smbus_alert(&adapter->adapter,
                                                      &adapter->alert_data);
                 if (adapter->ara)
diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
index df0976f4432a..1a7cad874756 100644
--- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c
+++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
@@ -118,8 +118,6 @@ static void thunder_i2c_clock_disable(struct device *dev, struct clk *clk)
 static int thunder_i2c_smbus_setup_of(struct octeon_i2c *i2c,
                                       struct device_node *node)
 {
-        u32 type;
-
         if (!node)
                 return -EINVAL;
 
@@ -127,10 +125,6 @@ static int thunder_i2c_smbus_setup_of(struct octeon_i2c *i2c,
         if (!i2c->alert_data.irq)
                 return -EINVAL;
 
-        type = irqd_get_trigger_type(irq_get_irq_data(i2c->alert_data.irq));
-        i2c->alert_data.alert_edge_triggered =
-                (type & IRQ_TYPE_LEVEL_MASK) ? 1 : 0;
-
         i2c->ara = i2c_setup_smbus_alert(&i2c->adap, &i2c->alert_data);
         if (!i2c->ara)
                 return -ENODEV;
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
index f9271c713d20..d4af2701ac6e 100644
--- a/drivers/i2c/i2c-smbus.c
+++ b/drivers/i2c/i2c-smbus.c
@@ -25,8 +25,6 @@
 #include <linux/workqueue.h>
 
 struct i2c_smbus_alert {
-        unsigned int            alert_edge_triggered:1;
-        int                     irq;
         struct work_struct      alert;
         struct i2c_client       *ara;           /* Alert response address */
 };
@@ -72,13 +70,12 @@ static int smbus_do_alert(struct device *dev, void *addrp)
  * The alert IRQ handler needs to hand work off to a task which can issue
  * SMBus calls, because those sleeping calls can't be made in IRQ context.
  */
-static void smbus_alert(struct work_struct *work)
+static irqreturn_t smbus_alert(int irq, void *d)
 {
-        struct i2c_smbus_alert *alert;
+        struct i2c_smbus_alert *alert = d;
         struct i2c_client *ara;
         unsigned short prev_addr = 0;   /* Not a valid address */
 
-        alert = container_of(work, struct i2c_smbus_alert, alert);
         ara = alert->ara;
 
         for (;;) {
@@ -115,21 +112,17 @@ static void smbus_alert(struct work_struct *work)
                 prev_addr = data.addr;
         }
 
-        /* We handled all alerts; re-enable level-triggered IRQs */
-        if (!alert->alert_edge_triggered)
-                enable_irq(alert->irq);
+        return IRQ_HANDLED;
 }
 
-static irqreturn_t smbalert_irq(int irq, void *d)
+static void smbalert_work(struct work_struct *work)
 {
-        struct i2c_smbus_alert *alert = d;
+        struct i2c_smbus_alert *alert;
+
+        alert = container_of(work, struct i2c_smbus_alert, alert);
 
-        /* Disable level-triggered IRQs until we handle them */
-        if (!alert->alert_edge_triggered)
-                disable_irq_nosync(irq);
+        smbus_alert(0, alert);
 
-        schedule_work(&alert->alert);
-        return IRQ_HANDLED;
 }
 
 /* Setup SMBALERT# infrastructure */
@@ -139,28 +132,28 @@ static int smbalert_probe(struct i2c_client *ara,
         struct i2c_smbus_alert_setup *setup = dev_get_platdata(&ara->dev);
         struct i2c_smbus_alert *alert;
         struct i2c_adapter *adapter = ara->adapter;
-        int res;
+        int res, irq;
 
         alert = devm_kzalloc(&ara->dev, sizeof(struct i2c_smbus_alert),
                              GFP_KERNEL);
         if (!alert)
                 return -ENOMEM;
 
-        alert->alert_edge_triggered = setup->alert_edge_triggered;
-        alert->irq = setup->irq;
-        INIT_WORK(&alert->alert, smbus_alert);
+        irq = setup->irq;
+        INIT_WORK(&alert->alert, smbalert_work);
         alert->ara = ara;
 
-        if (setup->irq > 0) {
-                res = devm_request_irq(&ara->dev, setup->irq, smbalert_irq,
-                                       0, "smbus_alert", alert);
+        if (irq > 0) {
+                res = devm_request_threaded_irq(&ara->dev, irq,
+                                                NULL, smbus_alert,
+                                                IRQF_SHARED | IRQF_ONESHOT,
+                                                "smbus_alert", alert);
                 if (res)
                         return res;
         }
 
         i2c_set_clientdata(ara, alert);
-        dev_info(&adapter->dev, "supports SMBALERT#, %s trigger\n",
-                 setup->alert_edge_triggered ? "edge" : "level");
+        dev_info(&adapter->dev, "supports SMBALERT#\n");
 
         return 0;
 }
diff --git a/include/linux/i2c-smbus.h b/include/linux/i2c-smbus.h
index a1385023a29b..19efbd14e812 100644
--- a/include/linux/i2c-smbus.h
+++ b/include/linux/i2c-smbus.h
@@ -42,7 +42,6 @@
  * properly set.
  */
 struct i2c_smbus_alert_setup {
-        unsigned int            alert_edge_triggered:1;
         int                     irq;
 };