diff for duplicates of <20151005172516.59b3ba55@bbrezillon> diff --git a/a/1.txt b/N1/1.txt index ab549f8..7b98c1a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,20 +12,20 @@ Thierry Reding <thierry.reding@gmail.com> wrote: > > > > Thierry Reding <thierry.reding@gmail.com> wrote: > > > > > > > > > On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote: -> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a écrit : +> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a écrit : > > > > > > > Robert Jarzmik <robert.jarzmik@free.fr> writes: > > > > > > > > > > > > > >> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f. > > > > > > >> This commit breaks legacy platforms, for which : > > > > > > >> (a) no pwm table is added (legacy platforms) > > > > > > >> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore -> > > > > > >> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get() +> > > > > > >> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get() > > > > > > >> returns -EPROBE_DEFER > > > > > > >> (c) as a consequence, this code is unreachable in pwm_bl.c : > > > > > > >> if (IS_ERR(pb->pwm)) { > > > > > > >> ret = PTR_ERR(pb->pwm); > > > > > > >> dev_info(&pdev->dev, "%s:%d(): %d\n", __func__, __LINE__, ret); -> > > > > > >> if (ret = -EPROBE_DEFER) +> > > > > > >> if (ret == -EPROBE_DEFER) > > > > > > >> goto err_alloc; > > > > > > >> > > > > > > >> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -54,7 +54,7 @@ Thierry Reding <thierry.reding@gmail.com> wrote: > > > > > > pb->pwm = devm_pwm_get(&pdev->dev, NULL); > > > > > > if (IS_ERR(pb->pwm)) { > > > > > > ret = PTR_ERR(pb->pwm); -> > > > > > - if (ret = -EPROBE_DEFER) +> > > > > > - if (ret == -EPROBE_DEFER) > > > > > > - goto err_alloc; > > > > > > > > > > > > dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -77,7 +77,7 @@ Thierry Reding <thierry.reding@gmail.com> wrote: > > > > > you want to be nit-picking), but it is subtly buggy. If you have a > > > > > system with multiple PWM providers, you could end up failing the first > > > > > pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and -> > > > > this could succeed because data->pwm_id = 0, and that other provider +> > > > > this could succeed because data->pwm_id == 0, and that other provider > > > > > could be exporting the PWM with this ID. If I remember correctly this > > > > > was one of the reasons why the offending commit was merged in the first > > > > > place. diff --git a/a/content_digest b/N1/content_digest index 57eb067..23bf458 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,7 +8,7 @@ "ref\020151005140741.GA10625@ulmo\0" "From\0Boris Brezillon <boris.brezillon@free-electrons.com>\0" "Subject\0Re: [PATCH] Revert \"backlight: pwm: Handle EPROBE_DEFER while requesting the PWM\"\0" - "Date\0Mon, 05 Oct 2015 15:25:16 +0000\0" + "Date\0Mon, 5 Oct 2015 17:25:16 +0200\0" "To\0Thierry Reding <thierry.reding@gmail.com>\0" "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" Robert Jarzmik <robert.jarzmik@free.fr> @@ -36,20 +36,20 @@ "> > > > Thierry Reding <thierry.reding@gmail.com> wrote:\n" "> > > > \n" "> > > > > On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote:\n" - "> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a \303\203\302\251crit :\n" + "> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a \303\251crit :\n" "> > > > > > > Robert Jarzmik <robert.jarzmik@free.fr> writes:\n" "> > > > > > > \n" "> > > > > > >> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f.\n" "> > > > > > >> This commit breaks legacy platforms, for which :\n" "> > > > > > >> (a) no pwm table is added (legacy platforms)\n" "> > > > > > >> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore\n" - "> > > > > > >> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" + "> > > > > > >> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" "> > > > > > >> returns -EPROBE_DEFER\n" "> > > > > > >> (c) as a consequence, this code is unreachable in pwm_bl.c :\n" "> > > > > > >> if (IS_ERR(pb->pwm)) {\n" "> > > > > > >> \tret = PTR_ERR(pb->pwm);\n" "> > > > > > >> \tdev_info(&pdev->dev, \"%s:%d(): %d\\n\", __func__, __LINE__, ret);\n" - "> > > > > > >> \tif (ret = -EPROBE_DEFER)\n" + "> > > > > > >> \tif (ret == -EPROBE_DEFER)\n" "> > > > > > >> \t\tgoto err_alloc;\n" "> > > > > > >>\n" "> > > > > > >> \tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -78,7 +78,7 @@ "> > > > > > \tpb->pwm = devm_pwm_get(&pdev->dev, NULL);\n" "> > > > > > \tif (IS_ERR(pb->pwm)) {\n" "> > > > > > \t\tret = PTR_ERR(pb->pwm);\n" - "> > > > > > -\t\tif (ret = -EPROBE_DEFER)\n" + "> > > > > > -\t\tif (ret == -EPROBE_DEFER)\n" "> > > > > > -\t\t\tgoto err_alloc;\n" "> > > > > > \n" "> > > > > > \t\tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -101,7 +101,7 @@ "> > > > > you want to be nit-picking), but it is subtly buggy. If you have a\n" "> > > > > system with multiple PWM providers, you could end up failing the first\n" "> > > > > pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and\n" - "> > > > > this could succeed because data->pwm_id = 0, and that other provider\n" + "> > > > > this could succeed because data->pwm_id == 0, and that other provider\n" "> > > > > could be exporting the PWM with this ID. If I remember correctly this\n" "> > > > > was one of the reasons why the offending commit was merged in the first\n" "> > > > > place.\n" @@ -189,4 +189,4 @@ "Embedded Linux and Kernel engineering\n" http://free-electrons.com -84062d4bf8730ed2431d89ee00252864fdefcf8bdfe2990156da19b272946232 +33fb9af1f5aaa64669c45819a8c40a9f746ecef1f4a8b6bf2e380bf3d86b59c7
diff --git a/a/1.txt b/N2/1.txt index ab549f8..243de1f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,20 +12,20 @@ Thierry Reding <thierry.reding@gmail.com> wrote: > > > > Thierry Reding <thierry.reding@gmail.com> wrote: > > > > > > > > > On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote: -> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a écrit : +> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a écrit : > > > > > > > Robert Jarzmik <robert.jarzmik@free.fr> writes: > > > > > > > > > > > > > >> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f. > > > > > > >> This commit breaks legacy platforms, for which : > > > > > > >> (a) no pwm table is added (legacy platforms) > > > > > > >> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore -> > > > > > >> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get() +> > > > > > >> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get() > > > > > > >> returns -EPROBE_DEFER > > > > > > >> (c) as a consequence, this code is unreachable in pwm_bl.c : > > > > > > >> if (IS_ERR(pb->pwm)) { > > > > > > >> ret = PTR_ERR(pb->pwm); > > > > > > >> dev_info(&pdev->dev, "%s:%d(): %d\n", __func__, __LINE__, ret); -> > > > > > >> if (ret = -EPROBE_DEFER) +> > > > > > >> if (ret == -EPROBE_DEFER) > > > > > > >> goto err_alloc; > > > > > > >> > > > > > > >> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -54,7 +54,7 @@ Thierry Reding <thierry.reding@gmail.com> wrote: > > > > > > pb->pwm = devm_pwm_get(&pdev->dev, NULL); > > > > > > if (IS_ERR(pb->pwm)) { > > > > > > ret = PTR_ERR(pb->pwm); -> > > > > > - if (ret = -EPROBE_DEFER) +> > > > > > - if (ret == -EPROBE_DEFER) > > > > > > - goto err_alloc; > > > > > > > > > > > > dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -77,7 +77,7 @@ Thierry Reding <thierry.reding@gmail.com> wrote: > > > > > you want to be nit-picking), but it is subtly buggy. If you have a > > > > > system with multiple PWM providers, you could end up failing the first > > > > > pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and -> > > > > this could succeed because data->pwm_id = 0, and that other provider +> > > > > this could succeed because data->pwm_id == 0, and that other provider > > > > > could be exporting the PWM with this ID. If I remember correctly this > > > > > was one of the reasons why the offending commit was merged in the first > > > > > place. @@ -111,7 +111,7 @@ Thierry Reding <thierry.reding@gmail.com> wrote: > Haha, I came up with exactly this earlier and I've been trying to think > of ways in which it could potentially break. -From a quick glance, I don't see any obvious problem in this approach. +>From a quick glance, I don't see any obvious problem in this approach. > > Thierry diff --git a/a/content_digest b/N2/content_digest index 57eb067..5709314 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,7 +8,7 @@ "ref\020151005140741.GA10625@ulmo\0" "From\0Boris Brezillon <boris.brezillon@free-electrons.com>\0" "Subject\0Re: [PATCH] Revert \"backlight: pwm: Handle EPROBE_DEFER while requesting the PWM\"\0" - "Date\0Mon, 05 Oct 2015 15:25:16 +0000\0" + "Date\0Mon, 5 Oct 2015 17:25:16 +0200\0" "To\0Thierry Reding <thierry.reding@gmail.com>\0" "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" Robert Jarzmik <robert.jarzmik@free.fr> @@ -36,20 +36,20 @@ "> > > > Thierry Reding <thierry.reding@gmail.com> wrote:\n" "> > > > \n" "> > > > > On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote:\n" - "> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a \303\203\302\251crit :\n" + "> > > > > > Le 30/09/2015 21:29, Robert Jarzmik a \303\251crit :\n" "> > > > > > > Robert Jarzmik <robert.jarzmik@free.fr> writes:\n" "> > > > > > > \n" "> > > > > > >> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f.\n" "> > > > > > >> This commit breaks legacy platforms, for which :\n" "> > > > > > >> (a) no pwm table is added (legacy platforms)\n" "> > > > > > >> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore\n" - "> > > > > > >> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" + "> > > > > > >> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" "> > > > > > >> returns -EPROBE_DEFER\n" "> > > > > > >> (c) as a consequence, this code is unreachable in pwm_bl.c :\n" "> > > > > > >> if (IS_ERR(pb->pwm)) {\n" "> > > > > > >> \tret = PTR_ERR(pb->pwm);\n" "> > > > > > >> \tdev_info(&pdev->dev, \"%s:%d(): %d\\n\", __func__, __LINE__, ret);\n" - "> > > > > > >> \tif (ret = -EPROBE_DEFER)\n" + "> > > > > > >> \tif (ret == -EPROBE_DEFER)\n" "> > > > > > >> \t\tgoto err_alloc;\n" "> > > > > > >>\n" "> > > > > > >> \tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -78,7 +78,7 @@ "> > > > > > \tpb->pwm = devm_pwm_get(&pdev->dev, NULL);\n" "> > > > > > \tif (IS_ERR(pb->pwm)) {\n" "> > > > > > \t\tret = PTR_ERR(pb->pwm);\n" - "> > > > > > -\t\tif (ret = -EPROBE_DEFER)\n" + "> > > > > > -\t\tif (ret == -EPROBE_DEFER)\n" "> > > > > > -\t\t\tgoto err_alloc;\n" "> > > > > > \n" "> > > > > > \t\tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -101,7 +101,7 @@ "> > > > > you want to be nit-picking), but it is subtly buggy. If you have a\n" "> > > > > system with multiple PWM providers, you could end up failing the first\n" "> > > > > pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and\n" - "> > > > > this could succeed because data->pwm_id = 0, and that other provider\n" + "> > > > > this could succeed because data->pwm_id == 0, and that other provider\n" "> > > > > could be exporting the PWM with this ID. If I remember correctly this\n" "> > > > > was one of the reasons why the offending commit was merged in the first\n" "> > > > > place.\n" @@ -135,7 +135,7 @@ "> Haha, I came up with exactly this earlier and I've been trying to think\n" "> of ways in which it could potentially break.\n" "\n" - "From a quick glance, I don't see any obvious problem in this approach.\n" + ">From a quick glance, I don't see any obvious problem in this approach.\n" "\n" "> \n" "> Thierry\n" @@ -189,4 +189,4 @@ "Embedded Linux and Kernel engineering\n" http://free-electrons.com -84062d4bf8730ed2431d89ee00252864fdefcf8bdfe2990156da19b272946232 +ffbb6ba1abf12fc4dd4095db1a6d2ad68f4e2a97ca5cc290714f2d437ec852f9
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.