diff for duplicates of <52CE3C28.5090303@marvell.com> diff --git a/a/1.txt b/N1/1.txt index 1263991..2e1a561 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On 01/09/2014 01:13 PM, Zhou Zhu wrote: > add device tree support for mmp fb/controller > the description at Documentation/devicetree/bindings/fb/mmp-disp.txt > -> Signed-off-by: Zhou Zhu <zzhu3@marvell.com> +> Signed-off-by: Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> > --- > Documentation/devicetree/bindings/fb/mmp-disp.txt | 71 ++++++++++++ > drivers/video/mmp/fb/mmpfb.c | 71 ++++++++---- @@ -124,7 +124,7 @@ On 01/09/2014 01:13 PM, Zhou Zhu wrote: > - int ret, modes_num; > - > - mi = pdev->dev.platform_data; -> - if (mi = NULL) { +> - if (mi == NULL) { > - dev_err(&pdev->dev, "no platform data defined\n"); > - return -EINVAL; > - } @@ -134,7 +134,7 @@ On 01/09/2014 01:13 PM, Zhou Zhu wrote: > > /* initialize fb */ > info = framebuffer_alloc(sizeof(struct mmpfb_info), &pdev->dev); -> if (info = NULL) +> if (info == NULL) > return -ENOMEM; > fbi = info->par; > - if (!fbi) { @@ -160,7 +160,7 @@ On 01/09/2014 01:13 PM, Zhou Zhu wrote: > } > +#else > + mi = pdev->dev.platform_data; -> + if (mi = NULL) { +> + if (mi == NULL) { > + dev_err(&pdev->dev, "no platform data defined\n"); > + goto failed; > + } @@ -363,7 +363,7 @@ On 01/09/2014 01:13 PM, Zhou Zhu wrote: > +#else > /* get configs from platform data */ > mi = pdev->dev.platform_data; -> if (mi = NULL || !mi->path_num || !mi->paths) { +> if (mi == NULL || !mi->path_num || !mi->paths) { > @@ -476,17 +534,21 @@ static int mmphw_probe(struct platform_device *pdev) > goto failed; > } @@ -436,3 +436,7 @@ On 01/09/2014 01:13 PM, Zhou Zhu wrote: -- Thanks, -Zhou +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index f9d66e2..b4c33b4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01389244394-10779-1-git-send-email-zzhu3@marvell.com\0" "ref\01389244394-10779-1-git-send-email-zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org\0" - "From\0Zhou Zhu <zzhu3@marvell.com>\0" + "From\0Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\0" "Subject\0Re: [PATCH] video: mmp: add device tree support\0" - "Date\0Thu, 09 Jan 2014 06:05:28 +0000\0" + "Date\0Thu, 9 Jan 2014 14:05:28 +0800\0" "To\0Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>" " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "Cc\0linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>" @@ -18,7 +18,7 @@ "> add device tree support for mmp fb/controller\n" "> the description at Documentation/devicetree/bindings/fb/mmp-disp.txt\n" ">\n" - "> Signed-off-by: Zhou Zhu <zzhu3@marvell.com>\n" + "> Signed-off-by: Zhou Zhu <zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\n" "> ---\n" "> Documentation/devicetree/bindings/fb/mmp-disp.txt | 71 ++++++++++++\n" "> drivers/video/mmp/fb/mmpfb.c | 71 ++++++++----\n" @@ -139,7 +139,7 @@ "> -\tint ret, modes_num;\n" "> -\n" "> -\tmi = pdev->dev.platform_data;\n" - "> -\tif (mi = NULL) {\n" + "> -\tif (mi == NULL) {\n" "> -\t\tdev_err(&pdev->dev, \"no platform data defined\\n\");\n" "> -\t\treturn -EINVAL;\n" "> -\t}\n" @@ -149,7 +149,7 @@ ">\n" "> \t/* initialize fb */\n" "> \tinfo = framebuffer_alloc(sizeof(struct mmpfb_info), &pdev->dev);\n" - "> \tif (info = NULL)\n" + "> \tif (info == NULL)\n" "> \t\treturn -ENOMEM;\n" "> \tfbi = info->par;\n" "> -\tif (!fbi) {\n" @@ -175,7 +175,7 @@ "> \t}\n" "> +#else\n" "> +\tmi = pdev->dev.platform_data;\n" - "> +\tif (mi = NULL) {\n" + "> +\tif (mi == NULL) {\n" "> +\t\tdev_err(&pdev->dev, \"no platform data defined\\n\");\n" "> +\t\tgoto failed;\n" "> +\t}\n" @@ -378,7 +378,7 @@ "> +#else\n" "> \t/* get configs from platform data */\n" "> \tmi = pdev->dev.platform_data;\n" - "> \tif (mi = NULL || !mi->path_num || !mi->paths) {\n" + "> \tif (mi == NULL || !mi->path_num || !mi->paths) {\n" "> @@ -476,17 +534,21 @@ static int mmphw_probe(struct platform_device *pdev)\n" "> \t\tgoto failed;\n" "> \t}\n" @@ -450,6 +450,10 @@ ">\n" "\n" "-- \n" - Thanks, -Zhou + "Thanks, -Zhou\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -2db337e10d973aede45689fe9c917fadf3b258ee32460b7e5802f344d54305b5 +9201d508965cca5cf7066b1215b1857b079e848889644fb0d11c13369b203de4
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.