pinctrl: cherryview: Drop goto label
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 19 Jun 2023 13:20:12 +0000 (16:20 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 19 Jun 2023 14:03:52 +0000 (17:03 +0300)
We do not use goto labels in the Intel pin control drivers,
so drop the only one in the entire folder.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/pinctrl/intel/pinctrl-cherryview.c

index b9b2b1d2d47fb8896e4792b5bdd5c5772cf52b9a..eee0f9bc3d323938779e863100234f99659b5fc5 100644 (file)
@@ -1413,8 +1413,10 @@ static int chv_gpio_irq_type(struct irq_data *d, unsigned int type)
        raw_spin_lock_irqsave(&chv_lock, flags);
 
        ret = chv_gpio_set_intr_line(pctrl, hwirq);
-       if (ret)
-               goto out_unlock;
+       if (ret) {
+               raw_spin_unlock_irqrestore(&chv_lock, flags);
+               return ret;
+       }
 
        /*
         * Pins which can be used as shared interrupt are configured in
@@ -1455,10 +1457,9 @@ static int chv_gpio_irq_type(struct irq_data *d, unsigned int type)
        else if (type & IRQ_TYPE_LEVEL_MASK)
                irq_set_handler_locked(d, handle_level_irq);
 
-out_unlock:
        raw_spin_unlock_irqrestore(&chv_lock, flags);
 
-       return ret;
+       return 0;
 }
 
 static const struct irq_chip chv_gpio_irq_chip = {