diff for duplicates of <1350638436.3339.2.camel@gitbox> diff --git a/a/1.txt b/N1/1.txt index 69f7530..5fd32e6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Fri, 2012-10-19 at 18:06 +0900, Alexandre Courbot wrote: > Make use of the power sequences specified in the device tree or platform > data to control how the backlight is powered on and off. > -> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> +> Signed-off-by: Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> > --- > .../bindings/video/backlight/pwm-backlight.txt | 72 ++++++++- > drivers/video/backlight/Kconfig | 1 + @@ -187,7 +187,7 @@ Same here.. owm_enable() in backlight_off() > @@ -51,8 +103,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl) > brightness = pb->notify(pb->dev, brightness); > -> if (brightness = 0) { +> if (brightness == 0) { > - pwm_config(pb->pwm, 0, pb->period); > - pwm_disable(pb->pwm); > + pwm_backlight_off(bl); @@ -232,7 +232,7 @@ Same here.. owm_enable() in backlight_off() > if (!data) { > ret = pwm_backlight_parse_dt(&pdev->dev, &defdata); > - if (ret < 0) { -> + if (ret = -EPROBE_DEFER) { +> + if (ret == -EPROBE_DEFER) { > + return ret; > + } else if (ret < 0) { > dev_err(&pdev->dev, "failed to find platform data\n"); diff --git a/a/content_digest b/N1/content_digest index de74f02..eaf30b9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01350637589-7405-1-git-send-email-acourbot@nvidia.com\0" "ref\01350637589-7405-3-git-send-email-acourbot@nvidia.com\0" "ref\01350637589-7405-3-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "From\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\0" "Subject\0Re: [PATCH v7 2/3] pwm_backlight: use power sequences\0" - "Date\0Fri, 19 Oct 2012 09:20:36 +0000\0" + "Date\0Fri, 19 Oct 2012 22:20:36 +1300\0" "To\0Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" "Cc\0linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org> @@ -23,7 +23,7 @@ "> Make use of the power sequences specified in the device tree or platform\n" "> data to control how the backlight is powered on and off.\n" "> \n" - "> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>\n" + "> Signed-off-by: Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n" "> ---\n" "> .../bindings/video/backlight/pwm-backlight.txt | 72 ++++++++-\n" "> drivers/video/backlight/Kconfig | 1 +\n" @@ -208,7 +208,7 @@ "> @@ -51,8 +103,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl)\n" "> \t\tbrightness = pb->notify(pb->dev, brightness);\n" "> \n" - "> \tif (brightness = 0) {\n" + "> \tif (brightness == 0) {\n" "> -\t\tpwm_config(pb->pwm, 0, pb->period);\n" "> -\t\tpwm_disable(pb->pwm);\n" "> +\t\tpwm_backlight_off(bl);\n" @@ -253,7 +253,7 @@ "> \tif (!data) {\n" "> \t\tret = pwm_backlight_parse_dt(&pdev->dev, &defdata);\n" "> -\t\tif (ret < 0) {\n" - "> +\t\tif (ret = -EPROBE_DEFER) {\n" + "> +\t\tif (ret == -EPROBE_DEFER) {\n" "> +\t\t\treturn ret;\n" "> +\t\t} else if (ret < 0) {\n" "> \t\t\tdev_err(&pdev->dev, \"failed to find platform data\\n\");\n" @@ -416,4 +416,4 @@ "Regards\n" Tony P -780c1a0fd044710d9fc63cbd1745860fee82a8caada09a1f69d625434b01314b +eb791c81df30358ab7c53e3a8e4d79d10ba593b52df26a4871e3de752c280aa1
diff --git a/a/1.txt b/N2/1.txt index 69f7530..ba67bb0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -187,7 +187,7 @@ Same here.. owm_enable() in backlight_off() > @@ -51,8 +103,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl) > brightness = pb->notify(pb->dev, brightness); > -> if (brightness = 0) { +> if (brightness == 0) { > - pwm_config(pb->pwm, 0, pb->period); > - pwm_disable(pb->pwm); > + pwm_backlight_off(bl); @@ -232,7 +232,7 @@ Same here.. owm_enable() in backlight_off() > if (!data) { > ret = pwm_backlight_parse_dt(&pdev->dev, &defdata); > - if (ret < 0) { -> + if (ret = -EPROBE_DEFER) { +> + if (ret == -EPROBE_DEFER) { > + return ret; > + } else if (ret < 0) { > dev_err(&pdev->dev, "failed to find platform data\n"); diff --git a/a/content_digest b/N2/content_digest index de74f02..05bdffe 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,25 @@ "ref\01350637589-7405-1-git-send-email-acourbot@nvidia.com\0" "ref\01350637589-7405-3-git-send-email-acourbot@nvidia.com\0" - "ref\01350637589-7405-3-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0" "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0Re: [PATCH v7 2/3] pwm_backlight: use power sequences\0" - "Date\0Fri, 19 Oct 2012 09:20:36 +0000\0" - "To\0Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\0" - "Cc\0linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org> - Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> - linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Leela Krishna Amudala <l.krishna-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> - Anton Vorontsov <cbou-JGs/UdohzUI@public.gmane.org> - linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> - " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" + "Date\0Fri, 19 Oct 2012 22:20:36 +1300\0" + "To\0Alexandre Courbot <acourbot@nvidia.com>\0" + "Cc\0Stephen Warren <swarren@nvidia.com>" + Thierry Reding <thierry.reding@avionic-design.de> + Simon Glass <sjg@chromium.org> + Grant Likely <grant.likely@secretlab.ca> + Rob Herring <rob.herring@calxeda.com> + Mark Brown <broonie@opensource.wolfsonmicro.com> + Anton Vorontsov <cbou@mail.ru> + David Woodhouse <dwmw2@infradead.org> + Arnd Bergmann <arnd@arndb.de> + linux-fbdev@vger.kernel.org + linux-pm@vger.kernel.org + Leela Krishna Amudala <l.krishna@samsung.com> + devicetree-discuss@lists.ozlabs.org + linux-doc@vger.kernel.org + linux-kernel@vger.kernel.org + " linux-tegra@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 2012-10-19 at 18:06 +0900, Alexandre Courbot wrote:\n" @@ -208,7 +211,7 @@ "> @@ -51,8 +103,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl)\n" "> \t\tbrightness = pb->notify(pb->dev, brightness);\n" "> \n" - "> \tif (brightness = 0) {\n" + "> \tif (brightness == 0) {\n" "> -\t\tpwm_config(pb->pwm, 0, pb->period);\n" "> -\t\tpwm_disable(pb->pwm);\n" "> +\t\tpwm_backlight_off(bl);\n" @@ -253,7 +256,7 @@ "> \tif (!data) {\n" "> \t\tret = pwm_backlight_parse_dt(&pdev->dev, &defdata);\n" "> -\t\tif (ret < 0) {\n" - "> +\t\tif (ret = -EPROBE_DEFER) {\n" + "> +\t\tif (ret == -EPROBE_DEFER) {\n" "> +\t\t\treturn ret;\n" "> +\t\t} else if (ret < 0) {\n" "> \t\t\tdev_err(&pdev->dev, \"failed to find platform data\\n\");\n" @@ -416,4 +419,4 @@ "Regards\n" Tony P -780c1a0fd044710d9fc63cbd1745860fee82a8caada09a1f69d625434b01314b +2e1903a6291c6e52880de9083d320af2d721b33cfa61a1b257c84d98495505a4
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.