From patchwork Tue Apr 16 12:33:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162309 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4159703jan; Tue, 16 Apr 2019 05:33:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUQsPx31X0SRyF01c7jv1Px4UlgdRFCRITcYB5F64P7xP0Mg6mxj5ckPngm1g5Jzs+xB5u X-Received: by 2002:a63:6941:: with SMTP id e62mr72994242pgc.99.1555418038979; Tue, 16 Apr 2019 05:33:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555418038; cv=none; d=google.com; s=arc-20160816; b=yCJrcGfpYQMk1NrrLiupQThWG7Ff5IRDH2BSb9/tzcsMgDInu4ymW6MpGroX9nCPcQ OCsD6i1TdduczFIr8iPqO7fiTOlDYARO0Bd7/zZsYoLbos44I7ahZh3noJMZRnLMcNNY /6IQVFK/IEErOU6tiQYkicmvq6CZTAbAOzAhiRtZD2DwizelH7mCt5z1sUc/rkycu395 Wo9eosZrQ5Fhu3DkT/ATIa9dU8rHBeeX/RofxmbrYm4zzLXgwBhgg1Zf2AtjtOw2b3np 0qf/lCZtN7tNR82GW+O+smh3RX8x33QcJK8915Vchv0FhV1q9o+kAGJT/lJ7J7gBHx6B s0kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Mr3eBmOt8BYuMbB7sb2YSjSd9bnAYuP3IDZrYrvKOy0=; b=wCE+yw+xgDhPAwnEluvcfELKurqShxqj7ydVYT+Hglegvg3u3vri0XOyx7qodx4ZOt p2MWYXZaajxFldTEhhrQfDZBYfSnaKv4o81UGz/LPWm47S7cT7+U8V1pRWNtZNNEKYKG oXUJMdRMV71DrUVUR6Sk1DXx50do00Fw9BNKPDRvI5YRe2C1cMkB7qJmQN2e6j7qNhT1 yxFI+yOCjTLIfLssIUyQGGh9q+xsUFmURRhRA3AEm+VoZaQiu5vTs7AIQ28dQdLO8qPn KjSidL3XtPhy85wTuH41iuLIk70OHJZLEJx7BOnp0UPwaMiUB3DCJfzidlEbx1P9TwPz XLtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si39835513pgp.45.2019.04.16.05.33.58; Tue, 16 Apr 2019 05:33:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727490AbfDPMd6 (ORCPT + 1 other); Tue, 16 Apr 2019 08:33:58 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:45461 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727240AbfDPMd6 (ORCPT ); Tue, 16 Apr 2019 08:33:58 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MfbwW-1geqb801Ae-00fzxb; Tue, 16 Apr 2019 14:33:26 +0200 From: Arnd Bergmann To: Greg Kroah-Hartman , Jiri Slaby Cc: Arnd Bergmann , Phil Elwell , "Gustavo A. R. Silva" , Stefan Potyra , Mao Wenan , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] serial: sc16is7xx: fix unused label warning Date: Tue, 16 Apr 2019 14:33:14 +0200 Message-Id: <20190416123321.3577638-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:Isv801bhuFl5TPOhgPhYg49CB4hUSHIfDyBdHkXyjrE6jHQsVRY 0Hb9mHFX3KvqK44OPt04V48L08vIUpEOaO13zt4FnBahsxKsjzXHOr0GGXptEtpBnrpdbv1 O5gRktt32NIaiea9SYUt+nnV3czISsTReOllGefyw6EXVK4wgNdNoum9tiCfKzG7aTLbyv/ RGcM7gpQOPBygSArdaG2g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:NAuNrnS1aTg=:TFvsQhfn12DMfGoZMQB26S ZUmBJxIvA/NH/xESEJUYR+ObjDi5hHOZyrLvyNi6V6VlwqibFJZ1sBGQsxOAxHFNfKd2mAL2Q gi7d5oMSvSlYLiBIYUxnJZu7Az6NrE9ouhgoUlDIgoOZGxsc2rwVFOlD65VSdFAqvrsF+sqMB gtXDlHaT3aseLt34s0AjRC/wPjsAosHYgdNI2vwbU0zveiO0FV8IrswjzsGh9F2a0UhuHX7Kn eQwjn3eLKeGzS2Zj6diM6lijsGLM4/gqJlKu9NE3m1mZxNka3P7odRgobznwyD8RdfrUE5BTa xqXuiHNwIPuVUJDAeG6C6hqflxgAxbdQeEytCsS9bT602UmCuPz0sErRu4YCxJKMje22Dp+Fp gMsaWoJN0xoOW8PxFX6mqPEpui+SysrT3DIVu5cVa/yC3WSn9wImCQb94BDAl9igxmR8wWIMz tB07T1hX/pb7GqAOVk75jTv/HFGYgDCNIx/tDGpRE4u0BeVKHcc15lwpQjKqEJ7Nxjzbr/HMj YtDbD12R9cetwGHpPKvR8TyUaakYNedmx0lTUHWqRU5LDhrmxMSSBq1Q4PO9M0yRpdiDLOmAv guwKekvEc/GZcnnFJgRA3logNbujf7YrbrEgElCU6kLkLS2tN2T6PGxCZIcQNA/TILHG7z4ZC +Z1rk2ARP/5+MeIFqy+f3xcUg5dhFyyYlcSCoTa6UkE5KpMt1RtuqW8pZ8xy0Jj1bf6sLgu1N Wg7LDDslTPGHSTRelxMeI3AnS5hIVmEFTAokSQ== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org 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 --- drivers/tty/serial/sc16is7xx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.0 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; }