Merge tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c
index 57efb251f9c462ceb6a4b5015f3658707fa119d0..b5adb79a631a6d88b3921d5210ddf72bc26a4c59 100644 (file)
--- a/drivers/gpio/gpio-thunderx.c
+++ b/drivers/gpio/gpio-thunderx.c
@@ -417,18 +417,6 @@ static struct irq_chip thunderx_gpio_irq_chip = {
        .flags                  = IRQCHIP_SET_TYPE_MASKED
 };
 
-static int thunderx_gpio_irq_map(struct irq_domain *d, unsigned int irq,
-                                irq_hw_number_t hwirq)
-{
-       struct thunderx_gpio *txgpio = d->host_data;
-
-       if (hwirq >= txgpio->chip.ngpio)
-               return -EINVAL;
-       if (!thunderx_gpio_is_gpio_nowarn(txgpio, hwirq))
-               return -EPERM;
-       return 0;
-}
-
 static int thunderx_gpio_irq_translate(struct irq_domain *d,
                                       struct irq_fwspec *fwspec,
                                       irq_hw_number_t *hwirq,
@@ -455,7 +443,6 @@ static int thunderx_gpio_irq_alloc(struct irq_domain *d, unsigned int virq,
 }
 
 static const struct irq_domain_ops thunderx_gpio_irqd_ops = {
-       .map            = thunderx_gpio_irq_map,
        .alloc          = thunderx_gpio_irq_alloc,
        .translate      = thunderx_gpio_irq_translate
 };