File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 3636#include <video/of_videomode.h>
3737#include <video/videomode.h>
3838#include "../edid.h"
39+ #include <linux/string_choices.h>
3940
4041/*
4142 * EDID parser
@@ -320,9 +321,9 @@ static void get_dpms_capabilities(unsigned char flags,
320321 if (flags & DPMS_STANDBY )
321322 specs -> dpms |= FB_DPMS_STANDBY ;
322323 DPRINTK (" DPMS: Active %s, Suspend %s, Standby %s\n" ,
323- (flags & DPMS_ACTIVE_OFF ) ? "yes" : "no" ,
324- (flags & DPMS_SUSPEND ) ? "yes" : "no" ,
325- (flags & DPMS_STANDBY ) ? "yes" : "no" );
324+ str_yes_no (flags & DPMS_ACTIVE_OFF ),
325+ str_yes_no (flags & DPMS_SUSPEND ),
326+ str_yes_no (flags & DPMS_STANDBY ));
326327}
327328
328329static void get_chroma (unsigned char * block , struct fb_monspecs * specs )
Original file line number Diff line number Diff line change 2222#include <linux/pci.h>
2323#include <linux/console.h>
2424#include <linux/backlight.h>
25+ #include <linux/string_choices.h>
2526#ifdef CONFIG_BOOTX_TEXT
2627#include <asm/btext.h>
2728#endif
@@ -622,7 +623,7 @@ static int nvidiafb_set_par(struct fb_info *info)
622623 else
623624 par -> FPDither = !!(NV_RD32 (par -> PRAMDAC , 0x083C ) & 1 );
624625 printk (KERN_INFO PFX "Flat panel dithering %s\n" ,
625- par -> FPDither ? "enabled" : "disabled" );
626+ str_enabled_disabled ( par -> FPDither ) );
626627 }
627628
628629 info -> fix .visual = (info -> var .bits_per_pixel == 8 ) ?
Original file line number Diff line number Diff line change 6060#include <linux/soc/pxa/cpu.h>
6161#include <video/of_display_timing.h>
6262#include <video/videomode.h>
63+ #include <linux/string_choices.h>
6364
6465#include <asm/io.h>
6566#include <asm/irq.h>
@@ -1419,7 +1420,7 @@ static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on)
14191420
14201421 if (ret < 0 )
14211422 pr_warn ("Unable to %s LCD supply regulator: %d\n" ,
1422- on ? "enable" : "disable" , ret );
1423+ str_enable_disable ( on ) , ret );
14231424 else
14241425 fbi -> lcd_supply_enabled = on ;
14251426 }
You can’t perform that action at this time.
0 commit comments