Merge 4.6-rc7 into char-misc-testing

This resolves a merge issue with drivers/hv/ring_buffer.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 12 insertions, 15 deletions

diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
index fe274b5851c7..93e66a9148b9 100644
--- a/drivers/video/fbdev/amba-clcd.c
+++ b/drivers/video/fbdev/amba-clcd.c
@@ -440,13 +440,14 @@ static int clcdfb_register(struct clcd_fb *fb)
                 fb->off_ienb = CLCD_PL111_IENB;
                 fb->off_cntl = CLCD_PL111_CNTL;
         } else {
-#ifdef CONFIG_ARCH_VERSATILE
-                fb->off_ienb = CLCD_PL111_IENB;
-                fb->off_cntl = CLCD_PL111_CNTL;
-#else
-                fb->off_ienb = CLCD_PL110_IENB;
-                fb->off_cntl = CLCD_PL110_CNTL;
-#endif
+                if (of_machine_is_compatible("arm,versatile-ab") ||
+                    of_machine_is_compatible("arm,versatile-pb")) {
+                        fb->off_ienb = CLCD_PL111_IENB;
+                        fb->off_cntl = CLCD_PL111_CNTL;
+                } else {
+                        fb->off_ienb = CLCD_PL110_IENB;
+                        fb->off_cntl = CLCD_PL110_CNTL;
+                }
         }
 
         fb->clk = clk_get(&fb->dev->dev, NULL);
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
index abfd1f6e3327..1954ec913ce5 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
@@ -200,20 +200,16 @@ static struct omap_dss_driver sharp_ls_ops = {
 static int sharp_ls_get_gpio(struct device *dev, int gpio, unsigned long flags,
                   char *desc, struct gpio_desc **gpiod)
 {
-        struct gpio_desc *gd;
         int r;
 
-        *gpiod = NULL;
-
         r = devm_gpio_request_one(dev, gpio, flags, desc);
-        if (r)
+        if (r) {
+                *gpiod = NULL;
                 return r == -ENOENT ? 0 : r;
+        }
 
-        gd = gpio_to_desc(gpio);
-        if (IS_ERR(gd))
-                return PTR_ERR(gd) == -ENOENT ? 0 : PTR_ERR(gd);
+        *gpiod = gpio_to_desc(gpio);
 
-        *gpiod = gd;
         return 0;
 }