From patchwork Fri Dec 14 22:10:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153911 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2597197ljp; Fri, 14 Dec 2018 14:12:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/WIjzUlOe1jPU7MacLFAlu08c2AkOwSoI3reDRZijl0gGqUnUoK0cC7+qltUddpVAeDOqnd X-Received: by 2002:a17:902:d806:: with SMTP id a6mr4265861plz.172.1544825573285; Fri, 14 Dec 2018 14:12:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825573; cv=none; d=google.com; s=arc-20160816; b=dPAqFlHPNTDaCVFteQOAxjw485gv6NTUz6HOks2islPuycmPszEP21E3A4y3BUkF0+ cLGFEaRmG4WAnGRifa95vV06y6c7LiLljYM0b0nrTpxNk8sRLdv93hJQtKjSOxM1BVE6 mZg0AKMHIqbp1oR+3AQgGiJa/D+yhUlrtZ/pTQNAuGWi2QTPQUg/rHTv0JwopvZYyTGW MQZ7PCkp/NJ+Zjikxqj7n58Z+4h/iSo6/re6ELSy3v7Usm56KvacUf+qPg0Hpx88uGeW Q/Q92SkHY00K2DE6v6KPtmqnOdO6LI405nZn9PROTvZNt8iw7mv5X0umhj7WtY3FQSbm WBmg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=VKqdC173t+YyvsaifB4tFpfFAau6ZzEJR1lwQSuKc3g=; b=Qsuu00qO9DOTOQyqJWeZZbugWkym+pDext0ItsHm8/T/K2qJ2sXj7Zq2l1daRIKhOk g1KNZNdg6tF0xhquDrhe2UXZDtZYuSS/soX527DmE1L18ItFU7lg4B5u1m6qoJgQm0xT lYYwTMzArKnW7nhb3qBmMzM6frI2kNdpT6eZjO2WUOj6oXuIuGrnGb+Z6zspA24JccZN tRbB6O+O1rWhNHX2XAkgUEJCn5HoWwsPInf+mwiGq5UqkuqQ3HV1VJH5zqNTSw5NCwUL g62RJ0F00lip0ZzhlhVH80BNo4UmhWR2I/rYDr5C4DTIhwY4oIUzGrzwoMNtAIPmRgr4 wCQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 y11si4976346pgj.442.2018.12.14.14.12.52; Fri, 14 Dec 2018 14:12:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731234AbeLNWMw (ORCPT + 15 others); Fri, 14 Dec 2018 17:12:52 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:42579 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731080AbeLNWMw (ORCPT ); Fri, 14 Dec 2018 17:12:52 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1N3sye-1hXhFg13ei-00zm3J; Fri, 14 Dec 2018 23:12:48 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman , Brendan Higgins , Joel Stanley Cc: stable@vger.kernel.org, Arnd Bergmann , openbmc@lists.ozlabs.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] [stable-4.19] i2c: aspeed: fix build warning Date: Fri, 14 Dec 2018 23:10:10 +0100 Message-Id: <20181214221023.3878670-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:UkDh7AG484n7mftoFIvINl/KQAshkFrxhFrTWJuknl6fAci4RsD r2sYU/EayygD4/EPUGi7OUGgeEz8n2p/M+Tl6MGhPwME2fZB/wFT5SuwNsriCqXSOdTEcWW jp6L6hj5ezeETo5Wg1oJ1f7cUqzp7K8vXjVFXzRnaDopCPsED3a61Kzok8i7h1gei2g7Xcm 6GiXNpZ+un4kJECeNifyg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:6IHFjg9tjAo=:4lnIT+guTjNYoSjojKvvus FlNJlSRsw3A5h2E+krCs1Y0XYo9DChsirZBJbWsMmoG5YsETyQHhkCmbiQeTmr6+xzwg5A/4B FPoqRvcabPtLPb58dYyKOibH795LjlUipGPkWZeYXHABTXJZKgGoeFLX5B16+Tql9XKbIjLFl momG+Hehdo2gDB2A/vXzhQTkiAben4xOeyMWUmuB4AMERW//gQwno2YQvrLqH9vfvnbnOuTmu 6WSjKAQkGtve5fk8YL19Ph+i3M9prBYhiyFl9vUJxMhAxegZgbYBCO1AbPa6SE/DVuTDCrc5U uAtZHA1IVEFZ9JooL23QL+7lk3T7/A/ctts5fwOpbwgqs/CJIR1q8h8HlhdWDKBQPN+r7IOFz aFb4LJ89wA642EJ4v8XwJPi1d6bWnLKPEet+WwPgqeNt2Cbwc+VfVqFAZgOTxVqD2GJDN8zBB wv45HwnuqBDq5bYRWSPb2HLY0gdZQun36S9NnlRaWKw+Qx5TQO8u3kcR3TkhPgmH8pRqV0Nzk +ikjw8aytriWZPc6trGNFKL6vpOb9eAaHlj7kPqY7W9sXssLvf/T28aXrPdO7raNmQBnxG136 MmiDflf2CRgQXJ3ERaNAuxTDumq3/lDxPmPsaaRgNQrOD3o3Lp666q6kosuu/pWd6wv4/QToB MjKqgvuW6XAl/aBQXVIntSvQVDI+SFzIUhZfDbk4x9NMrk/bOR+Vel1iMyv9P9JDdjkxCMMEk PKJXsZ46yhupIVqyULyg9DD3h2CRlZOaK71I/g== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Upstream commit 3e9efc3299dd ("i2c: aspeed: Handle master/slave combined irq events properly") reworked the interrupt handling and fixed a warning in the process: drivers/i2c/busses/i2c-aspeed.c: In function 'aspeed_i2c_bus_irq': drivers/i2c/busses/i2c-aspeed.c:567:1: error: label 'out' defined but not used [-Werror=unused-label] The warning is still present in v4.19.8 and can be fixed either by applying that original patch, or by adding a simple #ifdef. Here, I choose the second simpler option as the original patch seems too invasive for a stable backport. Signed-off-by: Arnd Bergmann --- drivers/i2c/busses/i2c-aspeed.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.0 diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c index a4f956c6d567..a19fbff16861 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -555,7 +555,7 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) spin_lock(&bus->lock); #if IS_ENABLED(CONFIG_I2C_SLAVE) - if (aspeed_i2c_slave_irq(bus)) { + if (IS_ENABLED(CONFIG_I2C_SLAVE) && aspeed_i2c_slave_irq(bus)) { dev_dbg(bus->dev, "irq handled by slave.\n"); ret = true; goto out; @@ -564,7 +564,9 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) ret = aspeed_i2c_master_irq(bus); +#if IS_ENABLED(CONFIG_I2C_SLAVE) out: +#endif spin_unlock(&bus->lock); return ret ? IRQ_HANDLED : IRQ_NONE; }