radeonfb: Fix debug option
PATCH 1/2 radeonfb: Fix debug option
Fix CONFIG_FB_RADEON_DEBUG. DEBUG must be defined before including any kernel header, otherwise dev_dbg() resolves to a no-op. Also, when debugging is disabled, don't set DEBUG at all instead of setting it to 0, to comply with what the kernel headers expect.
Signed-off-by Jean Delvare <[email protected]>
---
Note: RTRACE is essentially redundant with pr_debug.
drivers/video/aty/radeon_base.c | 3 ++- drivers/video/aty/radeon_i2c.c | 3 ++- drivers/video/aty/radeon_monitor.c | 2 +- drivers/video/aty/radeonfb.h | 12 +++++------- 4 files changed, 10 insertions(+), 10 deletions(-)
drivers/video/aty/radeonfb.h +5 -7
@@ -1,6 +1,10 @@#ifndef __RADEONFB_H__#define __RADEONFB_H__ +#ifdef CONFIG_FB_RADEON_DEBUG +#define DEBUG 1 +#endif +#include <linux/module.h> #include <linux/kernel.h> #include <linux/sched.h>
@@ -367,13 +371,7 @@ struct radeonfb_info {/* * Debugging stuffs */ -#ifdef CONFIG_FB_RADEON_DEBUG -#define DEBUG 1 -#else -#define DEBUG 0 -#endif - -#if DEBUG +#ifdef DEBUG #define RTRACE printk#else #define RTRACE if(0) printk
drivers/video/aty/radeon_base.c +2 -1
@@ -52,6 +52,8 @@#define RADEON_VERSION "0.2.0" +#include "radeonfb.h" +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h>
@@ -91,7 +93,6 @@#include "../edid.h" // MOVE THAT TO include/video #include "ati_ids.h" -#include "radeonfb.h" #define MAX_MAPPED_VRAM (2048*2048*4)#define MIN_MAPPED_VRAM (1024*768*1)
drivers/video/aty/radeon_i2c.c +2 -1
@@ -1,3 +1,5 @@ +#include "radeonfb.h" +#include <linux/module.h> #include <linux/kernel.h> #include <linux/delay.h>
@@ -11,7 +13,6 @@#include <asm/io.h> #include <video/radeon.h> -#include "radeonfb.h" #include "../edid.h" static void radeon_gpio_setscl (void * data,int state)
drivers/video/aty/radeon_monitor.c +1 -1
@@ -481,7 +481,7 @@ void __devinit radeon_probe_screens(struRTRACE ("Starting monitor auto detection...\n" ); -#if DEBUG && defined(CONFIG_FB_RADEON_I2C ) +#if defined(DEBUG ) && defined(CONFIG_FB_RADEON_I2C ) {u8 *EDIDs[4 ] = {NULL ,NULL ,NULL ,NULL };int mon_types[4 ] = {MT_NONE ,MT_NONE ,MT_NONE ,MT_NONE };
Signature · 6 lines
Jean Delvare ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/