From patchwork Mon Jun 1 17:54:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 224876 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDE7EC433E0 for ; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DC1820679 for ; Mon, 1 Jun 2020 18:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037890; bh=GKjC3/h/lwlH+z1jIr6atLxUKz3N0b9GwGORPMkIunw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CPCB7Aw5WnuwAn17Wn+bfNjyD9g7nAcxsGdmxtT56/30IIEnU8Wd9RoJgUh5horJM IZwlr6PnEa5oUwn1tHNMgiC+XaKaiu6AJbkL7OLyY7sn7f5PTrDg7yiFy2lgCwSKG0 fpB6a/IjTgLCF8bMLGYyoD5N3b8ahb7zggRBp7Ro= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729331AbgFAR7Y (ORCPT ); Mon, 1 Jun 2020 13:59:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:41810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729328AbgFAR7X (ORCPT ); Mon, 1 Jun 2020 13:59:23 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 10941206E2; Mon, 1 Jun 2020 17:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034362; bh=GKjC3/h/lwlH+z1jIr6atLxUKz3N0b9GwGORPMkIunw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=njI/dVlLDji9jxlPGCIaRuNjaGA1a6Mo4XFelt0gv5Y2IsAUyIKHeJrIkEIKGJRDk kOky25sSnB1w5LbEY++qzO4W1gM+fY1kBYziFuiiZpnaO5r+4hEf+ONbYAP5WGYneU UOs+8JJp3QSJvgf0lcUZSxL4uilOsGfj/XD7sn/o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guoqing Jiang , Arnd Bergmann , Guenter Roeck Subject: [PATCH 4.9 60/61] sc16is7xx: move label err_spi to correct section Date: Mon, 1 Jun 2020 19:54:07 +0200 Message-Id: <20200601174022.575861683@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174010.316778377@linuxfoundation.org> References: <20200601174010.316778377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guoqing Jiang commit e00164a0f000de893944981f41a568c981aca658 upstream. err_spi is used when SERIAL_SC16IS7XX_SPI is enabled, so make the label only available under SERIAL_SC16IS7XX_SPI option. Otherwise, the below warning appears. drivers/tty/serial/sc16is7xx.c:1523:1: warning: label ‘err_spi’ defined but not used [-Wunused-label] err_spi: ^~~~~~~ Signed-off-by: Guoqing Jiang Fixes: ac0cdb3d9901 ("sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()") Signed-off-by: Arnd Bergmann Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/sc16is7xx.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1523,10 +1523,12 @@ static int __init sc16is7xx_init(void) #endif return ret; +#ifdef CONFIG_SERIAL_SC16IS7XX_SPI err_spi: #ifdef CONFIG_SERIAL_SC16IS7XX_I2C i2c_del_driver(&sc16is7xx_i2c_uart_driver); #endif +#endif err_i2c: uart_unregister_driver(&sc16is7xx_uart); return ret;