From mboxrd@z Thu Jan 1 00:00:00 1970 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=ham 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 848C9C433E3 for ; Mon, 1 Jun 2020 18:59:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58BA520B80 for ; Mon, 1 Jun 2020 18:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037986; bh=gTD9ZJmmQfukiKb2cBKcYkeLRNsmSehEVufbEHZPuM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BnYzkBHCXrlY0QnOSYKV37h1O4Ozij86uSVN8yOYqlBDXP8RO4oT+LcJrJhsFMqz/ E/vih0pg7AFz0lHyT7jnVEE6bjDrp7Ag7z9/3LnrKcdm/jlgN8P0z+B+033WygCUyI zF1L61BoDw1DyHWSwZ+YXe39cRxSSF/3lDQHaubg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729565AbgFAS7p (ORCPT ); Mon, 1 Jun 2020 14:59:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:38000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728818AbgFAR5D (ORCPT ); Mon, 1 Jun 2020 13:57:03 -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 A063E2073B; Mon, 1 Jun 2020 17:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034223; bh=gTD9ZJmmQfukiKb2cBKcYkeLRNsmSehEVufbEHZPuM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ITBvb+5PfzUjF5ByDmPdZHTx6s0BfP8wNZqJvcicdgdQ6HT+/SGE91HYKzSZ6rAmU 2FWX7iX5J//0kotM7AHbzsYC3tfeQauFqL2VJwupP1cFrhmEuo3QiO24WBeKnNG8Lv Xu6oAhjKFM4vHogrve3XqLPT7y23T9zvjyduSPHc= 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.4 47/48] sc16is7xx: move label err_spi to correct section Date: Mon, 1 Jun 2020 19:53:57 +0200 Message-Id: <20200601174005.550471883@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601173952.175939894@linuxfoundation.org> References: <20200601173952.175939894@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @@ -1489,10 +1489,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;