On 28/10/13 16:23, Stephen Rothwell wrote:
> 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 <sfr@xxxxxxxxxxxxxxxx>
> 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 <sfr@xxxxxxxxxxxxxxxx>
> ---
> 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;
> }
> }
>
Thanks, I have applied this to the fbdev tree.
Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature
