serial: sc16is7xx: fix unused label warning

Message ID 20190416123321.3577638-1-arnd@arndb.de
State New
Headers show
Series
  • serial: sc16is7xx: fix unused label warning
Related show

Commit Message

Arnd Bergmann April 16, 2019, 12:33 p.m.
A bugfix introduced a harmless warning:

drivers/tty/serial/sc16is7xx.c:1523:1: error: unused label 'err_spi' [-Werror,-Wunused-label]

Move each label inside the correct #ifdef.

Fixes: ac0cdb3d9901 ("sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/tty/serial/sc16is7xx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.20.0

Patch

diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 09a183dfc526..a31db15cd7c0 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1520,11 +1520,13 @@  static int __init sc16is7xx_init(void)
 #endif
 	return ret;
 
+#ifdef CONFIG_SERIAL_SC16IS7XX_SPI
 err_spi:
+#endif
 #ifdef CONFIG_SERIAL_SC16IS7XX_I2C
 	i2c_del_driver(&sc16is7xx_i2c_uart_driver);
-#endif
 err_i2c:
+#endif
 	uart_unregister_driver(&sc16is7xx_uart);
 	return ret;
 }