evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: xgifb: Remove XGIFAIL() macro and its calls.

Browse source 
XGIFAIL() prints a message and returns a value, but it's used only in one
place. Better remove it and replace the call with the macro content.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Miguel Gómez 2012-06-18 13:12:03 +02:00 • committed by Greg Kroah-Hartman
parent 96cd1f8b41
commit 47cee13d1d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/xgifb/XGI_main.h
View file

@ -4,8 +4,6 @@
#include "XGIfb.h" #include "XGIfb.h"
#include "vb_def.h" #include "vb_def.h"
#define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while (0)
#ifndef PCI_DEVICE_ID_XGI_42 #ifndef PCI_DEVICE_ID_XGI_42
#define PCI_DEVICE_ID_XGI_42 0x042 #define PCI_DEVICE_ID_XGI_42 0x042
#endif #endif

6
drivers/staging/xgifb/XGI_main_26.c
View file

@ -1376,8 +1376,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
vtotal = var->upper_margin + var->yres + var->lower_margin vtotal = var->upper_margin + var->yres + var->lower_margin
+ var->vsync_len; + var->vsync_len;
if (!(htotal) || !(vtotal)) if (!(htotal) || !(vtotal)) {
XGIFAIL("XGIfb: no valid timing data"); pr_debug("XGIfb: no valid timing data\n");
return -EINVAL;
}
if (var->pixclock && htotal && vtotal) { if (var->pixclock && htotal && vtotal) {
drate = 1000000000 / var->pixclock; drate = 1000000000 / var->pixclock;