Commit dabc54a4 authored by Hugo Villeneuve's avatar Hugo Villeneuve Committed by Greg Kroah-Hartman
Browse files

serial: sc16is7xx: remove obsolete out_thread label 



Commit c8f71b49 ("serial: sc16is7xx: setup GPIO controller later
in probe") moved GPIO setup code later in probe function. Doing so
also required to move ports cleanup code (out_ports label) after the
GPIO cleanup code.

After these moves, the out_thread label becomes misplaced and makes
part of the cleanup code illogical.

This patch remove the now obsolete out_thread label and make GPIO
setup code jump to out_ports label if it fails.

Signed-off-by: default avatarHugo Villeneuve <hvilleneuve@dimonoff.com>
Reviewed-by: default avatarLech Perczak <lech.perczak@camlingroup.com>
Tested-by: default avatarLech Perczak <lech.perczak@camlingroup.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230807214556.540627-3-hugo@hugovil.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2861ed4d

drivers/tty/serial/sc16is7xx.c

+1 −3
Original line number Diff line number Diff line
@@ -1522,7 +1522,7 @@ static int sc16is7xx_probe(struct device *dev, 
		s->gpio.can_sleep	 = 1;

		ret = gpiochip_add_data(&s->gpio, s);

		if (ret)

			goto out_thread;

			goto out_ports;

	}

#endif
@@ -1548,8 +1548,6 @@ static int sc16is7xx_probe(struct device *dev, 
#ifdef CONFIG_GPIOLIB

	if (devtype->nr_gpio)

		gpiochip_remove(&s->gpio);



out_thread:

#endif



out_ports: