@@ -1332,22 +1332,6 @@ static int elan_probe(struct i2c_client *client,
}
}
- /*
- * Systems using device tree should set up wakeup via DTS,
- * the rest will configure device as wakeup source by default.
- */
- if (!dev->of_node)
- device_init_wakeup(dev, true);
-
- /*
- * The wake IRQ should be declared via device tree instead of assuming
- * the IRQ can wake the system. This is here for legacy reasons and
- * will be removed once the i2c-core supports querying ACPI for wake
- * capabilities.
- */
- if (!dev->power.wakeirq)
- dev_pm_set_wake_irq(dev, client->irq);
-
return 0;
}
The i2c-core will now handle setting the wake_irq and wake capability for DT and ACPI systems. Signed-off-by: Raul E Rangel <rrangel@chromium.org> --- Changes in v2: - I chose not to keep the legacy code around since systems without DT or ACPI should be rare. drivers/input/mouse/elan_i2c_core.c | 16 ---------------- 1 file changed, 16 deletions(-)