summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/smscufx.c
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2018-03-28 16:34:28 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-03-28 16:34:28 +0200
commit4befd0cf21cd8ab11f45b9601b37fe8bc91de29f (patch)
tree6423b782afc21133c51967813a645b2885f4119e /drivers/video/fbdev/smscufx.c
parentvideo: smscufx: Less checks in ufx_usb_probe() after error detection (diff)
downloadlinux-4befd0cf21cd8ab11f45b9601b37fe8bc91de29f.tar.xz
linux-4befd0cf21cd8ab11f45b9601b37fe8bc91de29f.zip
video: smscufx: Return an error code only as a constant in ufx_realloc_framebuffer()
* Return an error code without storing it in an intermediate variable. * Delete the label "error" and local variable "retval" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Cc: Steve Glendinning <steve.glendinning@shawell.net> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video/fbdev/smscufx.c')
-rw-r--r--drivers/video/fbdev/smscufx.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
index 893daeb1ffd9..abbded605d68 100644
--- a/drivers/video/fbdev/smscufx.c
+++ b/drivers/video/fbdev/smscufx.c
@@ -1293,7 +1293,6 @@ static struct fb_ops ufx_ops = {
* Assumes no active clients have framebuffer open */
static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info)
{
- int retval = -ENOMEM;
int old_len = info->fix.smem_len;
int new_len;
unsigned char *old_fb = info->screen_base;
@@ -1310,7 +1309,7 @@ static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info)
new_fb = vmalloc(new_len);
if (!new_fb) {
pr_err("Virtual framebuffer alloc failed");
- goto error;
+ return -ENOMEM;
}
if (info->screen_base) {
@@ -1323,11 +1322,7 @@ static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info)
info->fix.smem_start = (unsigned long) new_fb;
info->flags = smscufx_info_flags;
}
-
- retval = 0;
-
-error:
- return retval;
+ return 0;
}
/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, master,