pwm: make PWM_POLARITY_INVERTED flag optional

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

diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index c0f3fc44ab0eca1957a1bbf192dca1bc6be04291..b204033acaebb4e3fe8489c487a95a5406343f9b 100644 (file)
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -325,9 +325,9 @@ static irqreturn_t adnp_irq(int irq, void *data)
                pending &= isr & ier;
 
                for_each_set_bit(bit, &pending, 8) {
-                       unsigned int virq;
-                       virq = irq_find_mapping(adnp->domain, base + bit);
-                       handle_nested_irq(virq);
+                       unsigned int child_irq;
+                       child_irq = irq_find_mapping(adnp->domain, base + bit);
+                       handle_nested_irq(child_irq);
                }
        }
 
@@ -594,7 +594,7 @@ static struct i2c_driver adnp_i2c_driver = {
        .driver = {
                .name = "gpio-adnp",
                .owner = THIS_MODULE,
-               .of_match_table = of_match_ptr(adnp_of_match),
+               .of_match_table = adnp_of_match,
        },
        .probe = adnp_i2c_probe,
        .remove = adnp_i2c_remove,