commit ca5da7106214e03f5302ca630bd38a9145b27391 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[ARM] pxafb: Remove #if DEBUG, convert DPRINTK to pr_debug

Fix warning:
drivers/video/pxafb.h:119:5: warning: "DEBUG" is not defined
by removing the whole
#if DEBUG
#define DPRINTK(fmt, args...) printk...etc...
#else
#define DPRINTK(fmt, args...)
#endif
stuff - we have pr_debug() for this.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Russell King and committed by Russell King 20 years ago ca5da710 664cceb0

+51 -60

2 changed files

expand all

unified split

drivers

video

pxafb.c

pxafb.h

+51 -51

drivers/video/pxafb.c

··· 260 260 } 261 261 262 262 #ifdef CONFIG_CPU_FREQ 263 - DPRINTK("dma period = %d ps, clock = %d kHz\n", 264 - pxafb_display_dma_period(var), 265 - get_clk_frequency_khz(0)); 263 + pr_debug("pxafb: dma period = %d ps, clock = %d kHz\n", 264 + pxafb_display_dma_period(var), 265 + get_clk_frequency_khz(0)); 266 266 #endif 267 267 268 268 return 0; ··· 270 270 271 271 static inline void pxafb_set_truecolor(u_int is_true_color) 272 272 { 273 - DPRINTK("true_color = %d\n", is_true_color); 273 + pr_debug("pxafb: true_color = %d\n", is_true_color); 274 274 // do your machine-specific setup if needed 275 275 } 276 276 ··· 284 284 struct fb_var_screeninfo *var = &info->var; 285 285 unsigned long palette_mem_size; 286 286 287 - DPRINTK("set_par\n"); 287 + pr_debug("pxafb: set_par\n"); 288 288 289 289 if (var->bits_per_pixel == 16) 290 290 fbi->fb.fix.visual = FB_VISUAL_TRUECOLOR; ··· 308 308 309 309 palette_mem_size = fbi->palette_size * sizeof(u16); 310 310 311 - DPRINTK("palette_mem_size = 0x%08lx\n", (u_long) palette_mem_size); 311 + pr_debug("pxafb: palette_mem_size = 0x%08lx\n", palette_mem_size); 312 312 313 313 fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size); 314 314 fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size; ··· 369 369 struct pxafb_info *fbi = (struct pxafb_info *)info; 370 370 int i; 371 371 372 - DPRINTK("pxafb_blank: blank=%d\n", blank); 372 + pr_debug("pxafb: blank=%d\n", blank); 373 373 374 374 switch (blank) { 375 375 case FB_BLANK_POWERDOWN: ··· 508 508 u_long flags; 509 509 u_int lines_per_panel, pcd = get_pcd(var->pixclock); 510 510 511 - DPRINTK("Configuring PXA LCD\n"); 511 + pr_debug("pxafb: Configuring PXA LCD\n"); 512 512 513 - DPRINTK("var: xres=%d hslen=%d lm=%d rm=%d\n", 514 - var->xres, var->hsync_len, 515 - var->left_margin, var->right_margin); 516 - DPRINTK("var: yres=%d vslen=%d um=%d bm=%d\n", 517 - var->yres, var->vsync_len, 518 - var->upper_margin, var->lower_margin); 519 - DPRINTK("var: pixclock=%d pcd=%d\n", var->pixclock, pcd); 513 + pr_debug("var: xres=%d hslen=%d lm=%d rm=%d\n", 514 + var->xres, var->hsync_len, 515 + var->left_margin, var->right_margin); 516 + pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n", 517 + var->yres, var->vsync_len, 518 + var->upper_margin, var->lower_margin); 519 + pr_debug("var: pixclock=%d pcd=%d\n", var->pixclock, pcd); 520 520 521 521 #if DEBUG_VAR 522 522 if (var->xres < 16 || var->xres > 1024) ··· 589 589 if (pcd) 590 590 new_regs.lccr3 |= LCCR3_PixClkDiv(pcd); 591 591 592 - DPRINTK("nlccr0 = 0x%08x\n", new_regs.lccr0); 593 - DPRINTK("nlccr1 = 0x%08x\n", new_regs.lccr1); 594 - DPRINTK("nlccr2 = 0x%08x\n", new_regs.lccr2); 595 - DPRINTK("nlccr3 = 0x%08x\n", new_regs.lccr3); 592 + pr_debug("nlccr0 = 0x%08x\n", new_regs.lccr0); 593 + pr_debug("nlccr1 = 0x%08x\n", new_regs.lccr1); 594 + pr_debug("nlccr2 = 0x%08x\n", new_regs.lccr2); 595 + pr_debug("nlccr3 = 0x%08x\n", new_regs.lccr3); 596 596 597 597 /* Update shadow copy atomically */ 598 598 local_irq_save(flags); ··· 637 637 } 638 638 639 639 #if 0 640 - DPRINTK("fbi->dmadesc_fblow_cpu = 0x%p\n", fbi->dmadesc_fblow_cpu); 641 - DPRINTK("fbi->dmadesc_fbhigh_cpu = 0x%p\n", fbi->dmadesc_fbhigh_cpu); 642 - DPRINTK("fbi->dmadesc_palette_cpu = 0x%p\n", fbi->dmadesc_palette_cpu); 643 - DPRINTK("fbi->dmadesc_fblow_dma = 0x%x\n", fbi->dmadesc_fblow_dma); 644 - DPRINTK("fbi->dmadesc_fbhigh_dma = 0x%x\n", fbi->dmadesc_fbhigh_dma); 645 - DPRINTK("fbi->dmadesc_palette_dma = 0x%x\n", fbi->dmadesc_palette_dma); 640 + pr_debug("fbi->dmadesc_fblow_cpu = 0x%p\n", fbi->dmadesc_fblow_cpu); 641 + pr_debug("fbi->dmadesc_fbhigh_cpu = 0x%p\n", fbi->dmadesc_fbhigh_cpu); 642 + pr_debug("fbi->dmadesc_palette_cpu = 0x%p\n", fbi->dmadesc_palette_cpu); 643 + pr_debug("fbi->dmadesc_fblow_dma = 0x%x\n", fbi->dmadesc_fblow_dma); 644 + pr_debug("fbi->dmadesc_fbhigh_dma = 0x%x\n", fbi->dmadesc_fbhigh_dma); 645 + pr_debug("fbi->dmadesc_palette_dma = 0x%x\n", fbi->dmadesc_palette_dma); 646 646 647 - DPRINTK("fbi->dmadesc_fblow_cpu->fdadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fdadr); 648 - DPRINTK("fbi->dmadesc_fbhigh_cpu->fdadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fdadr); 649 - DPRINTK("fbi->dmadesc_palette_cpu->fdadr = 0x%x\n", fbi->dmadesc_palette_cpu->fdadr); 647 + pr_debug("fbi->dmadesc_fblow_cpu->fdadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fdadr); 648 + pr_debug("fbi->dmadesc_fbhigh_cpu->fdadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fdadr); 649 + pr_debug("fbi->dmadesc_palette_cpu->fdadr = 0x%x\n", fbi->dmadesc_palette_cpu->fdadr); 650 650 651 - DPRINTK("fbi->dmadesc_fblow_cpu->fsadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fsadr); 652 - DPRINTK("fbi->dmadesc_fbhigh_cpu->fsadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fsadr); 653 - DPRINTK("fbi->dmadesc_palette_cpu->fsadr = 0x%x\n", fbi->dmadesc_palette_cpu->fsadr); 651 + pr_debug("fbi->dmadesc_fblow_cpu->fsadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fsadr); 652 + pr_debug("fbi->dmadesc_fbhigh_cpu->fsadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fsadr); 653 + pr_debug("fbi->dmadesc_palette_cpu->fsadr = 0x%x\n", fbi->dmadesc_palette_cpu->fsadr); 654 654 655 - DPRINTK("fbi->dmadesc_fblow_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fblow_cpu->ldcmd); 656 - DPRINTK("fbi->dmadesc_fbhigh_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fbhigh_cpu->ldcmd); 657 - DPRINTK("fbi->dmadesc_palette_cpu->ldcmd = 0x%x\n", fbi->dmadesc_palette_cpu->ldcmd); 655 + pr_debug("fbi->dmadesc_fblow_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fblow_cpu->ldcmd); 656 + pr_debug("fbi->dmadesc_fbhigh_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fbhigh_cpu->ldcmd); 657 + pr_debug("fbi->dmadesc_palette_cpu->ldcmd = 0x%x\n", fbi->dmadesc_palette_cpu->ldcmd); 658 658 #endif 659 659 660 660 fbi->reg_lccr0 = new_regs.lccr0; ··· 684 684 */ 685 685 static inline void __pxafb_backlight_power(struct pxafb_info *fbi, int on) 686 686 { 687 - DPRINTK("backlight o%s\n", on ? "n" : "ff"); 687 + pr_debug("pxafb: backlight o%s\n", on ? "n" : "ff"); 688 688 689 689 if (pxafb_backlight_power) 690 690 pxafb_backlight_power(on); ··· 692 692 693 693 static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on) 694 694 { 695 - DPRINTK("LCD power o%s\n", on ? "n" : "ff"); 695 + pr_debug("pxafb: LCD power o%s\n", on ? "n" : "ff"); 696 696 697 697 if (pxafb_lcd_power) 698 698 pxafb_lcd_power(on); ··· 740 740 741 741 static void pxafb_enable_controller(struct pxafb_info *fbi) 742 742 { 743 - DPRINTK("Enabling LCD controller\n"); 744 - DPRINTK("fdadr0 0x%08x\n", (unsigned int) fbi->fdadr0); 745 - DPRINTK("fdadr1 0x%08x\n", (unsigned int) fbi->fdadr1); 746 - DPRINTK("reg_lccr0 0x%08x\n", (unsigned int) fbi->reg_lccr0); 747 - DPRINTK("reg_lccr1 0x%08x\n", (unsigned int) fbi->reg_lccr1); 748 - DPRINTK("reg_lccr2 0x%08x\n", (unsigned int) fbi->reg_lccr2); 749 - DPRINTK("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3); 743 + pr_debug("pxafb: Enabling LCD controller\n"); 744 + pr_debug("fdadr0 0x%08x\n", (unsigned int) fbi->fdadr0); 745 + pr_debug("fdadr1 0x%08x\n", (unsigned int) fbi->fdadr1); 746 + pr_debug("reg_lccr0 0x%08x\n", (unsigned int) fbi->reg_lccr0); 747 + pr_debug("reg_lccr1 0x%08x\n", (unsigned int) fbi->reg_lccr1); 748 + pr_debug("reg_lccr2 0x%08x\n", (unsigned int) fbi->reg_lccr2); 749 + pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3); 750 750 751 751 /* enable LCD controller clock */ 752 752 pxa_set_cken(CKEN16_LCD, 1); ··· 761 761 FDADR1 = fbi->fdadr1; 762 762 LCCR0 |= LCCR0_ENB; 763 763 764 - DPRINTK("FDADR0 0x%08x\n", (unsigned int) FDADR0); 765 - DPRINTK("FDADR1 0x%08x\n", (unsigned int) FDADR1); 766 - DPRINTK("LCCR0 0x%08x\n", (unsigned int) LCCR0); 767 - DPRINTK("LCCR1 0x%08x\n", (unsigned int) LCCR1); 768 - DPRINTK("LCCR2 0x%08x\n", (unsigned int) LCCR2); 769 - DPRINTK("LCCR3 0x%08x\n", (unsigned int) LCCR3); 764 + pr_debug("FDADR0 0x%08x\n", (unsigned int) FDADR0); 765 + pr_debug("FDADR1 0x%08x\n", (unsigned int) FDADR1); 766 + pr_debug("LCCR0 0x%08x\n", (unsigned int) LCCR0); 767 + pr_debug("LCCR1 0x%08x\n", (unsigned int) LCCR1); 768 + pr_debug("LCCR2 0x%08x\n", (unsigned int) LCCR2); 769 + pr_debug("LCCR3 0x%08x\n", (unsigned int) LCCR3); 770 770 } 771 771 772 772 static void pxafb_disable_controller(struct pxafb_info *fbi) 773 773 { 774 774 DECLARE_WAITQUEUE(wait, current); 775 775 776 - DPRINTK("Disabling LCD controller\n"); 776 + pr_debug("pxafb: disabling LCD controller\n"); 777 777 778 778 set_current_state(TASK_UNINTERRUPTIBLE); 779 779 add_wait_queue(&fbi->ctrlr_wait, &wait); ··· 1039 1039 fbi->palette_size = fbi->fb.var.bits_per_pixel == 8 ? 256 : 16; 1040 1040 1041 1041 palette_mem_size = fbi->palette_size * sizeof(u16); 1042 - DPRINTK("palette_mem_size = 0x%08lx\n", (u_long) palette_mem_size); 1042 + pr_debug("pxafb: palette_mem_size = 0x%08lx\n", palette_mem_size); 1043 1043 1044 1044 fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size); 1045 1045 fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size;

-9

drivers/video/pxafb.h

··· 114 114 #define PXA_NAME "PXA" 115 115 116 116 /* 117 - * Debug macros 118 - */ 119 - #if DEBUG 120 - # define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) 121 - #else 122 - # define DPRINTK(fmt, args...) 123 - #endif 124 - 125 - /* 126 117 * Minimum X and Y resolutions 127 118 */ 128 119 #define MIN_XRES 64