diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2018-03-28 10:34:28 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-03-28 10:34:28 -0400 |
commit | 4befd0cf21cd8ab11f45b9601b37fe8bc91de29f (patch) | |
tree | 6423b782afc21133c51967813a645b2885f4119e | |
parent | daa0524bc0a07048e33fdb61cae30467ef4ceff7 (diff) |
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>
-rw-r--r-- | drivers/video/fbdev/smscufx.c | 9 |
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 = { | |||
1293 | * Assumes no active clients have framebuffer open */ | 1293 | * Assumes no active clients have framebuffer open */ |
1294 | static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info) | 1294 | static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info) |
1295 | { | 1295 | { |
1296 | int retval = -ENOMEM; | ||
1297 | int old_len = info->fix.smem_len; | 1296 | int old_len = info->fix.smem_len; |
1298 | int new_len; | 1297 | int new_len; |
1299 | unsigned char *old_fb = info->screen_base; | 1298 | unsigned char *old_fb = info->screen_base; |
@@ -1310,7 +1309,7 @@ static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info) | |||
1310 | new_fb = vmalloc(new_len); | 1309 | new_fb = vmalloc(new_len); |
1311 | if (!new_fb) { | 1310 | if (!new_fb) { |
1312 | pr_err("Virtual framebuffer alloc failed"); | 1311 | pr_err("Virtual framebuffer alloc failed"); |
1313 | goto error; | 1312 | return -ENOMEM; |
1314 | } | 1313 | } |
1315 | 1314 | ||
1316 | if (info->screen_base) { | 1315 | if (info->screen_base) { |
@@ -1323,11 +1322,7 @@ static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info) | |||
1323 | info->fix.smem_start = (unsigned long) new_fb; | 1322 | info->fix.smem_start = (unsigned long) new_fb; |
1324 | info->flags = smscufx_info_flags; | 1323 | info->flags = smscufx_info_flags; |
1325 | } | 1324 | } |
1326 | 1325 | return 0; | |
1327 | retval = 0; | ||
1328 | |||
1329 | error: | ||
1330 | return retval; | ||
1331 | } | 1326 | } |
1332 | 1327 | ||
1333 | /* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, master, | 1328 | /* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, master, |