Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d56b4c3d authored by Miguel Gómez's avatar Miguel Gómez Committed by Greg Kroah-Hartman
Browse files

Staging: xgifb: remove DPRINTK() macro and replace it with pr_debug. 



Signed-off-by: default avatarMiguel Gómez <magomez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67c0bf7a

drivers/staging/xgifb/XGI_main_26.c

+18 −24
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ static unsigned int refresh_rate; 


#undef XGIFBDEBUG



#ifdef XGIFBDEBUG

#define DPRINTK(fmt, args...) pr_debug("%s: " fmt, __func__ , ## args)

#else

#define DPRINTK(fmt, args...)

#endif



#ifdef XGIFBDEBUG

static void dumpVGAReg(void)

{
@@ -662,7 +656,7 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info, 
				break;

			} else if (XGIfb_vrate[i].refresh > rate) {

				if ((XGIfb_vrate[i].refresh - rate) <= 3) {

					DPRINTK("XGIfb: Adjusting rate from %d up to %d\n",

					pr_debug("XGIfb: Adjusting rate from %d up to %d\n",

						 rate, XGIfb_vrate[i].refresh);

					xgifb_info->rate_idx =

						XGIfb_vrate[i].idx;
@@ -671,7 +665,7 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info, 
				} else if (((rate - XGIfb_vrate[i - 1].refresh)

						<= 2) && (XGIfb_vrate[i].idx

						!= 1)) {

					DPRINTK("XGIfb: Adjusting rate from %d down to %d\n",

					pr_debug("XGIfb: Adjusting rate from %d down to %d\n",

						 rate, XGIfb_vrate[i-1].refresh);

					xgifb_info->rate_idx =

						XGIfb_vrate[i - 1].idx;
@@ -680,7 +674,7 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info, 
				}

				break;

			} else if ((rate - XGIfb_vrate[i].refresh) <= 2) {

				DPRINTK("XGIfb: Adjusting rate from %d down to %d\n",

				pr_debug("XGIfb: Adjusting rate from %d down to %d\n",

					 rate, XGIfb_vrate[i].refresh);

				xgifb_info->rate_idx = XGIfb_vrate[i].idx;

				break;
@@ -995,7 +989,7 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) 
			}



			if ((filter >= 0) && (filter <= 7)) {

				DPRINTK("FilterTable[%d]-%d: %02x %02x %02x %02x\n",

				pr_debug("FilterTable[%d]-%d: %02x %02x %02x %02x\n",

					 filter_tb, filter,

					 XGI_TV_filter[filter_tb].

						filter[filter][0],
@@ -1064,7 +1058,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, 
	}



	if (!htotal || !vtotal) {

		DPRINTK("XGIfb: Invalid 'var' information\n");

		pr_debug("XGIfb: Invalid 'var' information\n");

		return -EINVAL;

	} pr_debug("var->pixclock=%d, htotal=%d, vtotal=%d\n",

			var->pixclock, htotal, vtotal);
@@ -1140,7 +1134,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, 


		XGIfb_post_setmode(xgifb_info);



		DPRINTK("XGIfb: Set new mode: %dx%dx%d-%d\n",

		pr_debug("XGIfb: Set new mode: %dx%dx%d-%d\n",

			 XGIbios_mode[xgifb_info->mode_idx].xres,

			 XGIbios_mode[xgifb_info->mode_idx].yres,

			 XGIbios_mode[xgifb_info->mode_idx].bpp,