From: Grant Likely <grant.likely@secretlab.ca>
Date: Thu, 4 Oct 2007 21:44:52 +0000 (-0600)
Subject: [POWERPC] XilinxFB: Make missing pdata structure non-fatal
X-Git-Tag: v2.6.24-rc1~1450^2~14^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3cec00366e9d60ff65c6f6f8fffdfcadea01056;p=linux-2.6-omap-h63xx.git

[POWERPC] XilinxFB: Make missing pdata structure non-fatal

Missing pdata structure is not a fatal error.  The device can still be
initialized without it.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index dbb23a9fef7..e6e12be845a 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -349,15 +349,9 @@ xilinxfb_platform_probe(struct platform_device *pdev)
 {
 	struct xilinxfb_platform_data *pdata;
 	struct resource *res;
-	int width_mm;
-	int height_mm;
-	int rotate;
-
-	pdata = pdev->dev.platform_data;
-	if (!pdata) {
-		dev_err(&pdev->dev, "Missing pdata structure\n");
-		return -ENODEV;
-	}
+	int width_mm = 0;
+	int height_mm = 0;
+	int rotate = 0;
 
 	/* Find the registers address */
 	res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -366,9 +360,13 @@ xilinxfb_platform_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	height_mm = pdata->screen_height_mm;
-	width_mm = pdata->screen_width_mm;
-	rotate = pdata->rotate_screen ? 1 : 0;
+	/* If a pdata structure is provided, then extract the parameters */
+	pdata = pdev->dev.platform_data;
+	if (pdata) {
+		height_mm = pdata->screen_height_mm;
+		width_mm = pdata->screen_width_mm;
+		rotate = pdata->rotate_screen ? 1 : 0;
+	}
 
 	return xilinxfb_assign(&pdev->dev, res->start, width_mm, height_mm,
 			       rotate);