diff for duplicates of <1357158184-18213-1-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 497203c..2355454 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -70,27 +70,27 @@ index 77539c1..1c3ce2c 100644 fbi->fb.pseudo_palette = addr; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- if (res = NULL) { +- if (res == NULL) { - dev_err(&pdev->dev, "no I/O memory resource defined\n"); - ret = -ENODEV; - goto failed_fbi; - } - - res = request_mem_region(res->start, resource_size(res), DRIVER_NAME); -- if (res = NULL) { +- if (res == NULL) { - dev_err(&pdev->dev, "failed to request I/O memory\n"); - ret = -EBUSY; - goto failed_fbi; - } - fbi->regbase = ioremap(res->start, resource_size(res)); -- if (fbi->regbase = NULL) { +- if (fbi->regbase == NULL) { - dev_err(&pdev->dev, "failed to map I/O memory\n"); - ret = -EBUSY; - goto failed_free_res; - } + fbi->regbase = devm_request_and_ioremap(&pdev->dev, res); -+ if (fbi->regbase = NULL) ++ if (fbi->regbase == NULL) + return -EBUSY; np = of_parse_phandle(pdev->dev.of_node, "default-mode", 0); diff --git a/a/content_digest b/N1/content_digest index c159372..4fb5720 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "From\0linux@prisktech.co.nz (Tony Prisk)\0" "Subject\0[PATCH 1/4] drivers/video/wm8505fb.c: use devm_ functions\0" - "Date\0Wed, 02 Jan 2013 20:23:01 +0000\0" + "Date\0Thu, 3 Jan 2013 09:23:01 +1300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -76,27 +76,27 @@ " \tfbi->fb.pseudo_palette\t= addr;\n" " \n" " \tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "-\tif (res = NULL) {\n" + "-\tif (res == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"no I/O memory resource defined\\n\");\n" "-\t\tret = -ENODEV;\n" "-\t\tgoto failed_fbi;\n" "-\t}\n" "-\n" "-\tres = request_mem_region(res->start, resource_size(res), DRIVER_NAME);\n" - "-\tif (res = NULL) {\n" + "-\tif (res == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"failed to request I/O memory\\n\");\n" "-\t\tret = -EBUSY;\n" "-\t\tgoto failed_fbi;\n" "-\t}\n" " \n" "-\tfbi->regbase = ioremap(res->start, resource_size(res));\n" - "-\tif (fbi->regbase = NULL) {\n" + "-\tif (fbi->regbase == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"failed to map I/O memory\\n\");\n" "-\t\tret = -EBUSY;\n" "-\t\tgoto failed_free_res;\n" "-\t}\n" "+\tfbi->regbase = devm_request_and_ioremap(&pdev->dev, res);\n" - "+\tif (fbi->regbase = NULL)\n" + "+\tif (fbi->regbase == NULL)\n" "+\t\treturn -EBUSY;\n" " \n" " \tnp = of_parse_phandle(pdev->dev.of_node, \"default-mode\", 0);\n" @@ -215,4 +215,4 @@ "-- \n" 1.7.9.5 -ecbb0c47d99f019a699a68f51aabe5337c26c64c9472f1c01d7aeca25ec6e726 +62cb723c4c65636fa8d2224b4f16b736d6eb1190ee097b5ccf0de279a59ecd7d
diff --git a/a/1.txt b/N2/1.txt index 497203c..2355454 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -70,27 +70,27 @@ index 77539c1..1c3ce2c 100644 fbi->fb.pseudo_palette = addr; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- if (res = NULL) { +- if (res == NULL) { - dev_err(&pdev->dev, "no I/O memory resource defined\n"); - ret = -ENODEV; - goto failed_fbi; - } - - res = request_mem_region(res->start, resource_size(res), DRIVER_NAME); -- if (res = NULL) { +- if (res == NULL) { - dev_err(&pdev->dev, "failed to request I/O memory\n"); - ret = -EBUSY; - goto failed_fbi; - } - fbi->regbase = ioremap(res->start, resource_size(res)); -- if (fbi->regbase = NULL) { +- if (fbi->regbase == NULL) { - dev_err(&pdev->dev, "failed to map I/O memory\n"); - ret = -EBUSY; - goto failed_free_res; - } + fbi->regbase = devm_request_and_ioremap(&pdev->dev, res); -+ if (fbi->regbase = NULL) ++ if (fbi->regbase == NULL) + return -EBUSY; np = of_parse_phandle(pdev->dev.of_node, "default-mode", 0); diff --git a/a/content_digest b/N2/content_digest index c159372..212c3f8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,13 @@ "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0[PATCH 1/4] drivers/video/wm8505fb.c: use devm_ functions\0" - "Date\0Wed, 02 Jan 2013 20:23:01 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 3 Jan 2013 09:23:01 +1300\0" + "To\0Florian Schandinat <florianschandinat@gmx.de>\0" + "Cc\0linux-kernel@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + vt8500-wm8505-linux-kernel@googlegroups.com + linux-fbdev@vger.kernel.org + Julia Lawall <Julia.Lawall@lip6.fr> + " Tony Prisk <linux@prisktech.co.nz>\0" "\00:1\0" "b\0" "From: Julia Lawall <Julia.Lawall@lip6.fr>\n" @@ -76,27 +82,27 @@ " \tfbi->fb.pseudo_palette\t= addr;\n" " \n" " \tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "-\tif (res = NULL) {\n" + "-\tif (res == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"no I/O memory resource defined\\n\");\n" "-\t\tret = -ENODEV;\n" "-\t\tgoto failed_fbi;\n" "-\t}\n" "-\n" "-\tres = request_mem_region(res->start, resource_size(res), DRIVER_NAME);\n" - "-\tif (res = NULL) {\n" + "-\tif (res == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"failed to request I/O memory\\n\");\n" "-\t\tret = -EBUSY;\n" "-\t\tgoto failed_fbi;\n" "-\t}\n" " \n" "-\tfbi->regbase = ioremap(res->start, resource_size(res));\n" - "-\tif (fbi->regbase = NULL) {\n" + "-\tif (fbi->regbase == NULL) {\n" "-\t\tdev_err(&pdev->dev, \"failed to map I/O memory\\n\");\n" "-\t\tret = -EBUSY;\n" "-\t\tgoto failed_free_res;\n" "-\t}\n" "+\tfbi->regbase = devm_request_and_ioremap(&pdev->dev, res);\n" - "+\tif (fbi->regbase = NULL)\n" + "+\tif (fbi->regbase == NULL)\n" "+\t\treturn -EBUSY;\n" " \n" " \tnp = of_parse_phandle(pdev->dev.of_node, \"default-mode\", 0);\n" @@ -215,4 +221,4 @@ "-- \n" 1.7.9.5 -ecbb0c47d99f019a699a68f51aabe5337c26c64c9472f1c01d7aeca25ec6e726 +b6f8f813b403770d62665576eb3b239132850b62ac1c8f09bdb69d7dc9e0b6ba
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.