Skip to content

Commit 9314d05

Browse files
committed
pinctrl: cherryview: Drop goto label
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>
1 parent 605ba25 commit 9314d05

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/pinctrl/intel/pinctrl-cherryview.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,8 +1413,10 @@ static int chv_gpio_irq_type(struct irq_data *d, unsigned int type)
14131413
raw_spin_lock_irqsave(&chv_lock, flags);
14141414

14151415
ret = chv_gpio_set_intr_line(pctrl, hwirq);
1416-
if (ret)
1417-
goto out_unlock;
1416+
if (ret) {
1417+
raw_spin_unlock_irqrestore(&chv_lock, flags);
1418+
return ret;
1419+
}
14181420

14191421
/*
14201422
* 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)
14551457
else if (type & IRQ_TYPE_LEVEL_MASK)
14561458
irq_set_handler_locked(d, handle_level_irq);
14571459

1458-
out_unlock:
14591460
raw_spin_unlock_irqrestore(&chv_lock, flags);
14601461

1461-
return ret;
1462+
return 0;
14621463
}
14631464

14641465
static const struct irq_chip chv_gpio_irq_chip = {

0 commit comments

Comments
 (0)