From patchwork Mon Oct 28 14:23:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 3102191 Return-Path: X-Original-To: patchwork-linux-fbdev@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 817809F2B7 for ; Mon, 28 Oct 2013 14:23:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF9782029B for ; Mon, 28 Oct 2013 14:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D411D20377 for ; Mon, 28 Oct 2013 14:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756785Ab3J1OXa (ORCPT ); Mon, 28 Oct 2013 10:23:30 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:43615 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756545Ab3J1OXa (ORCPT ); Mon, 28 Oct 2013 10:23:30 -0400 Received: from canb.auug.org.au (unknown [IPv6:2402:b800:7003:7010::1:f1c5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id AD33E164069; Tue, 29 Oct 2013 01:23:23 +1100 (EST) Date: Tue, 29 Oct 2013 01:23:17 +1100 From: Stephen Rothwell To: Jean-Christophe PLAGNIOL-VILLARD , Florian Tobias Schandinat , Tomi Valkeinen , linux-fbdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Simek Subject: linux-next: build failure after merge of the final tree (fbdev tree related) Message-Id: <20131029012317.b9ba8173dee5bac1a5bd2404@canb.auug.org.au> X-Mailer: Sylpheed 3.4.0beta4 (GTK+ 2.24.21; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the final tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: drivers/video/xilinxfb.c: In function 'xilinxfb_of_probe': drivers/video/xilinxfb.c:431:30: error: 'op' undeclared (first use in this function) Caused by commit 353846fb8bb7 ("video: xilinxfb: Use standard variable name convention") from the fbdev tree. I have applied the following fix patch for today: From: Stephen Rothwell Date: Tue, 29 Oct 2013 01:18:22 +1100 Subject: [PATCH] video: xilinxfb: Fix for "Use standard variable name convention" Signed-off-by: Stephen Rothwell Tested-by: Michal Simek --- drivers/video/xilinxfb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 9eedf9673b7f..6ff1a91e9dfd 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c @@ -428,11 +428,11 @@ static int xilinxfb_of_probe(struct platform_device *pdev) #ifdef CONFIG_PPC_DCR else { int start; - start = dcr_resource_start(op->dev.of_node, 0); - drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0); - drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len); + start = dcr_resource_start(pdev->dev.of_node, 0); + drvdata->dcr_len = dcr_resource_len(pdev->dev.of_node, 0); + drvdata->dcr_host = dcr_map(pdev->dev.of_node, start, drvdata->dcr_len); if (!DCR_MAP_OK(drvdata->dcr_host)) { - dev_err(&op->dev, "invalid DCR address\n"); + dev_err(&pdev->dev, "invalid DCR address\n"); return -ENODEV; } }