Commit 47cee13d authored by Miguel Gómez's avatar Miguel Gómez Committed by Greg Kroah-Hartman

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

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: default avatarMiguel Gómez <magomez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96cd1f8b
...@@ -4,8 +4,6 @@ ...@@ -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
......
...@@ -1376,8 +1376,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment