diff for duplicates of <20140418155107.GB5354@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 19b1afd..57d45f8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ various threads regarding changes needed to this patch. > + int gpio; > + > + gpio = of_get_gpio(node, 0); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->enable_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse enable gpio\n"); @@ -34,7 +34,7 @@ gpio_backlight_probe_dt is doing. Then do we really want to do the dev_err for each -EPROBE_DEFER here? > + gpio = of_get_gpio(node, 1); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->backlight_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse backlight gpio\n"); diff --git a/a/content_digest b/N1/content_digest index 1f9222d..b9d7470 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,25 @@ "ref\01390301833-24944-20-git-send-email-tomi.valkeinen@ti.com\0" "From\0Tony Lindgren <tony@atomide.com>\0" "Subject\0Re: [PATCHv3 19/41] OMAPDSS: panel-dpi: Add DT support\0" - "Date\0Fri, 18 Apr 2014 15:51:08 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 18 Apr 2014 08:51:08 -0700\0" + "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + linux-omap@vger.kernel.org + linux-fbdev@vger.kernel.org + devicetree@vger.kernel.org + Archit Taneja <archit@ti.com> + Darren Etheridge <detheridge@ti.com> + Laurent Pinchart <laurent.pinchart@ideasonboard.com> + Stefan Roese <stefan.roese@gmail.com> + Sebastian Reichel <sre@debian.org> + Robert Nelson <robertcnelson@gmail.com> + Dr . H . Nikolaus Schaller <hns@goldelico.com> + Marek Belisko <marek@goldelico.com> + Sebastian Reichel <sre@ring0.de> + Javier Martinez Canillas <javier@dowhile0.org> + Enric Balletbo Serra <eballetbo@gmail.com> + Florian Vaussard <florian.vaussard@epfl.ch> + " Joachim Eastwood <manabian@gmail.com>\0" "\00:1\0" "b\0" "Hi,\n" @@ -29,7 +46,7 @@ "> +\tint gpio;\n" "> +\n" "> +\tgpio = of_get_gpio(node, 0);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->enable_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse enable gpio\\n\");\n" @@ -42,7 +59,7 @@ "Then do we really want to do the dev_err for each -EPROBE_DEFER here?\n" "\n" "> +\tgpio = of_get_gpio(node, 1);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->backlight_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse backlight gpio\\n\");\n" @@ -65,4 +82,4 @@ "\n" Tony -89330c1021ca2da9ceed26155b7835ca3d34a0650167c6cf60ba4f56a718a475 +dda0bf43a0e9f135c8fa80b706e27f03900f232dfd1d1b9860a3dec24f54fb09
diff --git a/a/1.txt b/N2/1.txt index 19b1afd..57d45f8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,7 +21,7 @@ various threads regarding changes needed to this patch. > + int gpio; > + > + gpio = of_get_gpio(node, 0); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->enable_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse enable gpio\n"); @@ -34,7 +34,7 @@ gpio_backlight_probe_dt is doing. Then do we really want to do the dev_err for each -EPROBE_DEFER here? > + gpio = of_get_gpio(node, 1); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->backlight_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse backlight gpio\n"); diff --git a/a/content_digest b/N2/content_digest index 1f9222d..4b702e3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\01390301833-24944-1-git-send-email-tomi.valkeinen@ti.com\0" "ref\01390301833-24944-20-git-send-email-tomi.valkeinen@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCHv3 19/41] OMAPDSS: panel-dpi: Add DT support\0" - "Date\0Fri, 18 Apr 2014 15:51:08 +0000\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCHv3 19/41] OMAPDSS: panel-dpi: Add DT support\0" + "Date\0Fri, 18 Apr 2014 08:51:08 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -29,7 +29,7 @@ "> +\tint gpio;\n" "> +\n" "> +\tgpio = of_get_gpio(node, 0);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->enable_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse enable gpio\\n\");\n" @@ -42,7 +42,7 @@ "Then do we really want to do the dev_err for each -EPROBE_DEFER here?\n" "\n" "> +\tgpio = of_get_gpio(node, 1);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->backlight_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse backlight gpio\\n\");\n" @@ -65,4 +65,4 @@ "\n" Tony -89330c1021ca2da9ceed26155b7835ca3d34a0650167c6cf60ba4f56a718a475 +0aa249528f4735ec441f76e4c58d87a2305b9033829a473eb109dc93f04b78ec
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.