OSDN Git Service

fbdev/omap: sysfs files can't disappear before the device is gone
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 May 2019 09:02:43 +0000 (11:02 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 12 Jun 2019 18:28:16 +0000 (20:28 +0200)
Which means lock_fb_info can never fail. Remove the error handling.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-13-daniel.vetter@ffwll.ch
drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c

index 8087a00..bd0d202 100644 (file)
@@ -60,8 +60,7 @@ static ssize_t store_rotate_type(struct device *dev,
        if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
                return -EINVAL;
 
-       if (!lock_fb_info(fbi))
-               return -ENODEV;
+       lock_fb_info(fbi);
 
        r = 0;
        if (rot_type == ofbi->rotation_type)
@@ -112,8 +111,7 @@ static ssize_t store_mirror(struct device *dev,
        if (r)
                return r;
 
-       if (!lock_fb_info(fbi))
-               return -ENODEV;
+       lock_fb_info(fbi);
 
        ofbi->mirror = mirror;
 
@@ -149,8 +147,7 @@ static ssize_t show_overlays(struct device *dev,
        ssize_t l = 0;
        int t;
 
-       if (!lock_fb_info(fbi))
-               return -ENODEV;
+       lock_fb_info(fbi);
        omapfb_lock(fbdev);
 
        for (t = 0; t < ofbi->num_overlays; t++) {
@@ -208,8 +205,7 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
        if (buf[len - 1] == '\n')
                len = len - 1;
 
-       if (!lock_fb_info(fbi))
-               return -ENODEV;
+       lock_fb_info(fbi);
        omapfb_lock(fbdev);
 
        if (len > 0) {
@@ -340,8 +336,7 @@ static ssize_t show_overlays_rotate(struct device *dev,
        ssize_t l = 0;
        int t;
 
-       if (!lock_fb_info(fbi))
-               return -ENODEV;
+       lock_fb_info(fbi);
 
        for (t = 0; t < ofbi->num_overlays; t++) {
                l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
@@ -369,8 +364,7 @@ static ssize_t store_overlays_rotate(struct device *dev,
        if (buf[len - 1] == '\n')
                len = len - 1;
 
-       if (!lock_fb_info(fbi))
-               return -ENODEV;
+       lock_fb_info(fbi);
 
        if (len > 0) {
                char *p = (char *)buf;
@@ -453,8 +447,7 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
 
        size = PAGE_ALIGN(size);
 
-       if (!lock_fb_info(fbi))
-               return -ENODEV;
+       lock_fb_info(fbi);
 
        if (display && display->driver->sync)
                display->driver->sync(display);