Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / drivers / gpio / gpio-intel-mid.c

diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c
index 118a6bf455d948bd876c689d404783ea44019ca7..aa28c65eb6b4f3a98e7aa6d5a1a1eac28d1c0c06 100644 (file)
--- a/drivers/gpio/gpio-intel-mid.c
+++ b/drivers/gpio/gpio-intel-mid.c
@@ -28,12 +28,10 @@
 #include <linux/stddef.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
-#include <linux/irqdomain.h>
 
 #define INTEL_MID_IRQ_TYPE_EDGE                (1 << 0)
 #define INTEL_MID_IRQ_TYPE_LEVEL       (1 << 1)
@@ -78,10 +76,12 @@ struct intel_mid_gpio {
        void __iomem                    *reg_base;
        spinlock_t                      lock;
        struct pci_dev                  *pdev;
-       struct irq_domain               *domain;
 };
 
-#define to_intel_gpio_priv(chip) container_of(chip, struct intel_mid_gpio, chip)
+static inline struct intel_mid_gpio *to_intel_gpio_priv(struct gpio_chip *gc)
+{
+       return container_of(gc, struct intel_mid_gpio, chip);
+}
 
 static void __iomem *gpio_reg(struct gpio_chip *chip, unsigned offset,
                              enum GPIO_REG reg_type)
@@ -182,15 +182,10 @@ static int intel_gpio_direction_output(struct gpio_chip *chip,
        return 0;
 }
 
-static int intel_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
-{
-       struct intel_mid_gpio *priv = to_intel_gpio_priv(chip);
-       return irq_create_mapping(priv->domain, offset);
-}
-
 static int intel_mid_irq_type(struct irq_data *d, unsigned type)
 {
-       struct intel_mid_gpio *priv = irq_data_get_irq_chip_data(d);
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct intel_mid_gpio *priv = to_intel_gpio_priv(gc);
        u32 gpio = irqd_to_hwirq(d);
        unsigned long flags;
        u32 value;
@@ -231,33 +226,11 @@ static void intel_mid_irq_mask(struct irq_data *d)
 {
 }
 
-static int intel_mid_irq_reqres(struct irq_data *d)
-{
-       struct intel_mid_gpio *priv = irq_data_get_irq_chip_data(d);
-
-       if (gpio_lock_as_irq(&priv->chip, irqd_to_hwirq(d))) {
-               dev_err(priv->chip.dev,
-                       "unable to lock HW IRQ %lu for IRQ\n",
-                       irqd_to_hwirq(d));
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static void intel_mid_irq_relres(struct irq_data *d)
-{
-       struct intel_mid_gpio *priv = irq_data_get_irq_chip_data(d);
-
-       gpio_unlock_as_irq(&priv->chip, irqd_to_hwirq(d));
-}
-
 static struct irq_chip intel_mid_irqchip = {
        .name           = "INTEL_MID-GPIO",
        .irq_mask       = intel_mid_irq_mask,
        .irq_unmask     = intel_mid_irq_unmask,
        .irq_set_type   = intel_mid_irq_type,
-       .irq_request_resources = intel_mid_irq_reqres,
-       .irq_release_resources = intel_mid_irq_relres,
 };
 
 static const struct intel_mid_gpio_ddata gpio_lincroft = {
@@ -330,8 +303,9 @@ MODULE_DEVICE_TABLE(pci, intel_gpio_ids);
 
 static void intel_mid_irq_handler(unsigned irq, struct irq_desc *desc)
 {
+       struct gpio_chip *gc = irq_desc_get_handler_data(desc);
+       struct intel_mid_gpio *priv = to_intel_gpio_priv(gc);
        struct irq_data *data = irq_desc_get_irq_data(desc);
-       struct intel_mid_gpio *priv = irq_data_get_irq_handler_data(data);
        struct irq_chip *chip = irq_data_get_irq_chip(data);
        u32 base, gpio, mask;
        unsigned long pending;
@@ -345,7 +319,7 @@ static void intel_mid_irq_handler(unsigned irq, struct irq_desc *desc)
                        mask = BIT(gpio);
                        /* Clear before handling so we can't lose an edge */
                        writel(mask, gedr);
-                       generic_handle_irq(irq_find_mapping(priv->domain,
+                       generic_handle_irq(irq_find_mapping(gc->irqdomain,
                                                            base + gpio));
                }
        }
@@ -371,23 +345,6 @@ static void intel_mid_irq_init_hw(struct intel_mid_gpio *priv)
        }
 }
 
-static int intel_gpio_irq_map(struct irq_domain *d, unsigned int irq,
-                           irq_hw_number_t hwirq)
-{
-       struct intel_mid_gpio *priv = d->host_data;
-
-       irq_set_chip_and_handler(irq, &intel_mid_irqchip, handle_simple_irq);
-       irq_set_chip_data(irq, priv);
-       irq_set_irq_type(irq, IRQ_TYPE_NONE);
-
-       return 0;
-}
-
-static const struct irq_domain_ops intel_gpio_irq_ops = {
-       .map = intel_gpio_irq_map,
-       .xlate = irq_domain_xlate_twocell,
-};
-
 static int intel_gpio_runtime_idle(struct device *dev)
 {
        int err = pm_schedule_suspend(dev, 500);
@@ -441,7 +398,6 @@ static int intel_gpio_probe(struct pci_dev *pdev,
        priv->chip.direction_output = intel_gpio_direction_output;
        priv->chip.get = intel_gpio_get;
        priv->chip.set = intel_gpio_set;
-       priv->chip.to_irq = intel_gpio_to_irq;
        priv->chip.base = gpio_base;
        priv->chip.ngpio = ddata->ngpio;
        priv->chip.can_sleep = false;
@@ -449,11 +405,6 @@ static int intel_gpio_probe(struct pci_dev *pdev,
 
        spin_lock_init(&priv->lock);
 
-       priv->domain = irq_domain_add_simple(pdev->dev.of_node, ddata->ngpio,
-                                       irq_base, &intel_gpio_irq_ops, priv);
-       if (!priv->domain)
-               return -ENOMEM;
-
        pci_set_drvdata(pdev, priv);
        retval = gpiochip_add(&priv->chip);
        if (retval) {
@@ -461,10 +412,23 @@ static int intel_gpio_probe(struct pci_dev *pdev,
                return retval;
        }
 
+       retval = gpiochip_irqchip_add(&priv->chip,
+                                     &intel_mid_irqchip,
+                                     irq_base,
+                                     handle_simple_irq,
+                                     IRQ_TYPE_NONE);
+       if (retval) {
+               dev_err(&pdev->dev,
+                       "could not connect irqchip to gpiochip\n");
+               return retval;
+       }
+
        intel_mid_irq_init_hw(priv);
 
-       irq_set_handler_data(pdev->irq, priv);
-       irq_set_chained_handler(pdev->irq, intel_mid_irq_handler);
+       gpiochip_set_chained_irqchip(&priv->chip,
+                                    &intel_mid_irqchip,
+                                    pdev->irq,
+                                    intel_mid_irq_handler);
 
        pm_runtime_put_noidle(&pdev->dev);
        pm_runtime_allow(&pdev->dev);