Merge tag 'v3.8-rc1' into staging/for_v3.9

Linux 3.8-rc1

* tag 'v3.8-rc1': (10696 commits)
  Linux 3.8-rc1
  Revert "nfsd: warn on odd reply state in nfsd_vfs_read"
  ARM: dts: fix duplicated build target and alphabetical sort out for exynos
  dm stripe: add WRITE SAME support
  dm: remove map_info
  dm snapshot: do not use map_context
  dm thin: dont use map_context
  dm raid1: dont use map_context
  dm flakey: dont use map_context
  dm raid1: rename read_record to bio_record
  dm: move target request nr to dm_target_io
  dm snapshot: use per_bio_data
  dm verity: use per_bio_data
  dm raid1: use per_bio_data
  dm: introduce per_bio_data
  dm kcopyd: add WRITE SAME support to dm_kcopyd_zero
  dm linear: add WRITE SAME support
  dm: add WRITE SAME support
  dm: prepare to support WRITE SAME
  dm ioctl: use kmalloc if possible
  ...

Conflicts:
	MAINTAINERS

1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 2ed7b633bbd9..1a00ad241edd 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -189,7 +189,7 @@ struct s3c_fb_vsync {
 
 /**
  * struct s3c_fb - overall hardware state of the hardware
- * @slock: The spinlock protection for this data sturucture.
+ * @slock: The spinlock protection for this data structure.
  * @dev: The device that we bound to, for printing, etc.
  * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk.
  * @lcd_clk: The clk (sclk) feeding pixclk.
@@ -268,10 +268,10 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
         case 8:
                 if (sfb->variant.palette[win->index] != 0) {
                         /* non palletised, A:1,R:2,G:3,B:2 mode */
-                        var->red.offset         = 4;
+                        var->red.offset         = 5;
                         var->green.offset       = 2;
                         var->blue.offset        = 0;
-                        var->red.length         = 5;
+                        var->red.length         = 2;
                         var->green.length       = 3;
                         var->blue.length        = 2;
                         var->transp.offset      = 7;
@@ -288,6 +288,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
                 /* 666 with one bit alpha/transparency */
                 var->transp.offset      = 18;
                 var->transp.length      = 1;
+                /* drop through */
         case 18:
                 var->bits_per_pixel     = 32;
 
@@ -329,6 +330,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
 
         default:
                 dev_err(sfb->dev, "invalid bpp\n");
+                return -EINVAL;
         }
 
         dev_dbg(sfb->dev, "%s: verified parameters\n", __func__);
@@ -1544,8 +1546,7 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int s3c_fb_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        struct s3c_fb *sfb = dev_get_drvdata(dev);
         struct s3c_fb_win *win;
         int win_no;
 
@@ -1572,8 +1573,7 @@ static int s3c_fb_suspend(struct device *dev)
 
 static int s3c_fb_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        struct s3c_fb *sfb = dev_get_drvdata(dev);
         struct s3c_fb_platdata *pd = sfb->pdata;
         struct s3c_fb_win *win;
         int win_no;
@@ -1623,7 +1623,7 @@ static int s3c_fb_resume(struct device *dev)
                 if (!win)
                         continue;
 
-                dev_dbg(&pdev->dev, "resuming window %d\n", win_no);
+                dev_dbg(dev, "resuming window %d\n", win_no);
                 s3c_fb_set_par(win->fbinfo);
         }
 
@@ -1636,8 +1636,7 @@ static int s3c_fb_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int s3c_fb_runtime_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        struct s3c_fb *sfb = dev_get_drvdata(dev);
 
         if (!sfb->variant.has_clksel)
                 clk_disable_unprepare(sfb->lcd_clk);
@@ -1649,8 +1648,7 @@ static int s3c_fb_runtime_suspend(struct device *dev)
 
 static int s3c_fb_runtime_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        struct s3c_fb *sfb = dev_get_drvdata(dev);
         struct s3c_fb_platdata *pd = sfb->pdata;
 
         clk_prepare_enable(sfb->bus_clk);
@@ -1910,7 +1908,7 @@ static struct s3c_fb_driverdata s3c_fb_data_exynos4 = {
 static struct s3c_fb_driverdata s3c_fb_data_exynos5 = {
         .variant = {
                 .nr_windows     = 5,
-                .vidtcon        = VIDTCON0,
+                .vidtcon        = FIMD_V8_VIDTCON0,
                 .wincon         = WINCON(0),
                 .winmap         = WINxMAP(0),
                 .keycon         = WKEYCON,