From patchwork Fri Dec 12 01:27:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lim, Siew Hoon" X-Patchwork-Id: 5478421 Return-Path: X-Original-To: patchwork-ltsi-dev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2FF8D9F2E8 for ; Fri, 12 Dec 2014 01:34:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5E563201C7 for ; Fri, 12 Dec 2014 01:34:09 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1CC5D2013A for ; Fri, 12 Dec 2014 01:34:08 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7AAA2A6E; Fri, 12 Dec 2014 01:34:07 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 7C466A6E for ; Fri, 12 Dec 2014 01:34:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id BC49D20346 for ; Fri, 12 Dec 2014 01:34:05 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 11 Dec 2014 17:32:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,561,1413270000"; d="scan'208";a="652604327" Received: from slim50-desk.png.intel.com ([10.221.79.135]) by orsmga002.jf.intel.com with ESMTP; 11 Dec 2014 17:34:04 -0800 From: Lim Siew Hoon To: ltsi-dev@lists.linuxfoundation.org Date: Fri, 12 Dec 2014 09:27:56 +0800 Message-Id: <1418347676-5422-1-git-send-email-siew.hoon.lim@intel.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Subject: [LTSI-dev] [PATCH] ltsi 3.10.61: Fixed compilation error in 8250_dw.c X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org X-Virus-Scanned: ClamAV using ClamSMTP Fixed the compilation error 'd' undeclared. Introduced by commit id: 1e6d1ee7d3aa94cd [Geert Uytterhoeven comment] The use of 'd->usr_reg' was added by: origin/3.10-ltsi:patches.baytrail/1148-tty-8250_dw-Add-support-for-OCTEON-UARTS.patch Upstream commit d5f1af7ece96cf52 ("tty/8250_dw: Add support for OCTEON UARTS.") Why don't we have the local variable 'd'? Because it was removed by commit 6d5e793314178861 ("serial: 8250_dw: Improve unwritable LCR workaround"), probably to fix a compiler warning: [wangnan: backport to 3.10.43: - adjust context - remove unneeded local var] Signed-off-by: Wang Nan So it looks like d5f1af7ece96cf52 was a prerequisite for 6d5e793314178861, while v3.10.48 only got a modified version of the latter, and 3.10-ltsi got the former afterwards, breaking the build. Signed-off-by: Lim Siew Hoon --- drivers/tty/serial/8250/8250_dw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index a278d1d..2c05c46 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -153,6 +153,7 @@ static unsigned int dw8250_serial_in32(struct uart_port *p, int offset) static int dw8250_handle_irq(struct uart_port *p) { unsigned int iir = p->serial_in(p, UART_IIR); + struct dw8250_data *d = p->private_data; if (serial8250_handle_irq(p, iir)) { return 1;