Merge tag 'regmap-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[karo-tx-linux.git] / drivers / gpio / gpio-lynxpoint.c

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index 70831e4b2c8baf1e3a19147689d2d1b964016b3b..66b18535b5ae368f3788cadb68cf8cda8aa628e2 100644 (file)
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -353,8 +353,7 @@ static int lp_gpio_irq_map(struct irq_domain *d, unsigned int irq,
 {
        struct lp_gpio *lg = d->host_data;
 
-       irq_set_chip_and_handler_name(irq, &lp_irqchip, handle_simple_irq,
-                                     "demux");
+       irq_set_chip_and_handler(irq, &lp_irqchip, handle_simple_irq);
        irq_set_chip_data(irq, lg);
        irq_set_irq_type(irq, IRQ_TYPE_NONE);
 
@@ -414,7 +413,7 @@ static int lp_gpio_probe(struct platform_device *pdev)
        gc->set = lp_gpio_set;
        gc->base = -1;
        gc->ngpio = LP_NUM_GPIO;
-       gc->can_sleep = 0;
+       gc->can_sleep = false;
        gc->dev = dev;
 
        /* set up interrupts  */
@@ -460,6 +459,7 @@ static const struct dev_pm_ops lp_gpio_pm_ops = {
 
 static const struct acpi_device_id lynxpoint_gpio_acpi_match[] = {
        { "INT33C7", 0 },
+       { "INT3437", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, lynxpoint_gpio_acpi_match);
@@ -491,4 +491,15 @@ static int __init lp_gpio_init(void)
        return platform_driver_register(&lp_gpio_driver);
 }
 
+static void __exit lp_gpio_exit(void)
+{
+       platform_driver_unregister(&lp_gpio_driver);
+}
+
 subsys_initcall(lp_gpio_init);
+module_exit(lp_gpio_exit);
+
+MODULE_AUTHOR("Mathias Nyman (Intel)");
+MODULE_DESCRIPTION("GPIO interface for Intel Lynxpoint");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:lp_gpio");