fbdev: Don't re-validate info->state in fb_ops implementations

The file-op entry points fb_read() and fb_write() verify that
info->state has been set to FBINFO_STATE_RUNNING. Remove the same
test from the implementations of struct fb_ops.{fb_read,fb_write}.

v2:
	* also remove test from ivtvfb, braodsheetfb, hecubafb and
	  metronomefb (Geert)

Signed-off-by: Thomas Zimmermann <[email protected]>
Tested-by: Sui Jingfeng <[email protected]>
Reviewed-by: Javier Martinez Canillas <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Acked-by: Helge Deller <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c
index 00ac94d4ab19d95e640d3b015a70a82115b2f04b..22123a25daea9cb02642070b97eba9a7c307d32d 100644 (file)
--- a/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@ -378,9 +378,6 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
        unsigned long dma_size;
        u16 lead = 0, tail = 0;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->screen_size;
 
        if (total_size == 0)

diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
index 65dc86b7081e3af285581a31df78d6b072b94710..691de5df581b896d132f3cbe5bb6b59fd6c7975a 100644 (file)
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
@@ -1013,9 +1013,6 @@ static ssize_t broadsheetfb_write(struct fb_info *info, const char __user *buf,
        int err = 0;
        unsigned long total_size;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->fix.smem_len;
 
        if (p > total_size)

diff --git a/drivers/video/fbdev/core/fb_sys_fops.c b/drivers/video/fbdev/core/fb_sys_fops.c
index 6589123f4127a07dc7103dfe456f692af7170f34..7dee5d3c7fb1477bc040ab3f60622cfdbad60195 100644 (file)
--- a/drivers/video/fbdev/core/fb_sys_fops.c
+++ b/drivers/video/fbdev/core/fb_sys_fops.c
@@ -22,9 +22,6 @@ ssize_t fb_sys_read(struct fb_info *info, char __user *buf, size_t count,
        unsigned long total_size, c;
        ssize_t ret;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->screen_size;
 
        if (total_size == 0)
@@ -64,9 +61,6 @@ ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
        unsigned long total_size, c;
        size_t ret;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->screen_size;
 
        if (total_size == 0)

diff --git a/drivers/video/fbdev/hecubafb.c b/drivers/video/fbdev/hecubafb.c
index ddfa2853cc419f3b426c74b9e2affc16f1ffb7f1..a2996d39f918cfd50e01c4d099001383284596cc 100644 (file)
--- a/drivers/video/fbdev/hecubafb.c
+++ b/drivers/video/fbdev/hecubafb.c
@@ -163,9 +163,6 @@ static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
        int err = 0;
        unsigned long total_size;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->fix.smem_len;
 
        if (p > total_size)

diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c
index afa9b41f5a87ddba238bff999bbdfa0178f08cb2..2bb068cadac63c9dc0ce3f48ff4be52841f30b9c 100644 (file)
--- a/drivers/video/fbdev/metronomefb.c
+++ b/drivers/video/fbdev/metronomefb.c
@@ -523,9 +523,6 @@ static ssize_t metronomefb_write(struct fb_info *info, const char __user *buf,
        int err = 0;
        unsigned long total_size;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->fix.smem_len;
 
        if (p > total_size)

diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c
index b528776c761251eb7e393ab63b1876296a5ca9e3..6f852cd756c5fe06410721a7ea6d45108b014022 100644 (file)
--- a/drivers/video/fbdev/sm712fb.c
+++ b/drivers/video/fbdev/sm712fb.c
@@ -1031,9 +1031,6 @@ static ssize_t smtcfb_read(struct fb_info *info, char __user *buf,
        if (!info || !info->screen_base)
                return -ENODEV;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->screen_size;
 
        if (total_size == 0)
@@ -1097,9 +1094,6 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf,
        if (!info || !info->screen_base)
                return -ENODEV;
 
-       if (info->state != FBINFO_STATE_RUNNING)
-               return -EPERM;
-
        total_size = info->screen_size;
 
        if (total_size == 0)