[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 dbb23a9fef7bd9d90e12330faccdd15ed5496e9f..e6e12be845a9104aba57f56a942d1e916bf6d037 100644 (file)
--- 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);