From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Subject: Re: linux-next: build failure after merge of the final tree (fbdev tree related) Date: Mon, 28 Oct 2013 15:39:47 +0100 Message-ID: <526E7733.6020509@monstr.eu> References: <20131029012317.b9ba8173dee5bac1a5bd2404@canb.auug.org.au> Reply-To: monstr@monstr.eu Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="phaUscxRjMls7GwoljvDcqWqcqC4NI2ep" Return-path: Received: from mail-ee0-f44.google.com ([74.125.83.44]:61378 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754442Ab3J1Ojv (ORCPT ); Mon, 28 Oct 2013 10:39:51 -0400 Received: by mail-ee0-f44.google.com with SMTP id c4so2996226eek.31 for ; Mon, 28 Oct 2013 07:39:50 -0700 (PDT) In-Reply-To: <20131029012317.b9ba8173dee5bac1a5bd2404@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Jean-Christophe PLAGNIOL-VILLARD , Florian Tobias Schandinat , Tomi Valkeinen , linux-fbdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Simek This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --phaUscxRjMls7GwoljvDcqWqcqC4NI2ep Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 10/28/2013 03:23 PM, Stephen Rothwell wrote: > Hi all, >=20 > After merging the final tree, today's linux-next build (powerpc > ppc44x_defconfig) failed like this: >=20 > drivers/video/xilinxfb.c: In function 'xilinxfb_of_probe': > drivers/video/xilinxfb.c:431:30: error: 'op' undeclared (first use in t= his function) >=20 > Caused by commit 353846fb8bb7 ("video: xilinxfb: Use standard variable > name convention") from the fbdev tree. >=20 > I have applied the following fix patch for today: >=20 > From: Stephen Rothwell > Date: Tue, 29 Oct 2013 01:18:22 +1100 > Subject: [PATCH] video: xilinxfb: Fix for "Use standard variable name c= onvention" >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/video/xilinxfb.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > 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_devi= ce *pdev) > #ifdef CONFIG_PPC_DCR > else { > int start; > - start =3D dcr_resource_start(op->dev.of_node, 0); > - drvdata->dcr_len =3D dcr_resource_len(op->dev.of_node, 0); > - drvdata->dcr_host =3D dcr_map(op->dev.of_node, start, drvdata->dcr_l= en); > + start =3D dcr_resource_start(pdev->dev.of_node, 0); > + drvdata->dcr_len =3D dcr_resource_len(pdev->dev.of_node, 0); > + drvdata->dcr_host =3D 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; > } > } >=20 Your fix is correct. Tested-by: Michal Simek Thanks, Michal --=20 Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform --phaUscxRjMls7GwoljvDcqWqcqC4NI2ep Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlJudzMACgkQykllyylKDCGTPgCfdqzPmLHNXCgFeqNWC4YNz0z+ EmAAn0mpKPX/pL6295OqX/mryMC45WgX =Nz5B -----END PGP SIGNATURE----- --phaUscxRjMls7GwoljvDcqWqcqC4NI2ep--