Commit c7d655ef authored by Chelsy Ratnawat's avatar Chelsy Ratnawat Committed by Helge Deller
Browse files

fbdev: Use string choices helpers 



Use string_choices.h helpers instead of hard-coded strings.

Signed-off-by: default avatarChelsy Ratnawat <chelsyratnawat2001@gmail.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent aad1d99b

drivers/video/fbdev/core/fbmon.c

+4 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <video/of_videomode.h>

#include <video/videomode.h>

#include "../edid.h"

#include <linux/string_choices.h>



/*

 * EDID parser
@@ -320,9 +321,9 @@ static void get_dpms_capabilities(unsigned char flags, 
	if (flags & DPMS_STANDBY)

		specs->dpms |= FB_DPMS_STANDBY;

	DPRINTK("      DPMS: Active %s, Suspend %s, Standby %s\n",

	       (flags & DPMS_ACTIVE_OFF) ? "yes" : "no",

	       (flags & DPMS_SUSPEND)    ? "yes" : "no",

	       (flags & DPMS_STANDBY)    ? "yes" : "no");

	       str_yes_no(flags & DPMS_ACTIVE_OFF),

	       str_yes_no(flags & DPMS_SUSPEND),

	       str_yes_no(flags & DPMS_STANDBY));

}



static void get_chroma(unsigned char *block, struct fb_monspecs *specs)

drivers/video/fbdev/nvidia/nvidia.c

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/pci.h>

#include <linux/console.h>

#include <linux/backlight.h>

#include <linux/string_choices.h>

#ifdef CONFIG_BOOTX_TEXT

#include <asm/btext.h>

#endif
@@ -622,7 +623,7 @@ static int nvidiafb_set_par(struct fb_info *info) 
		else

			par->FPDither = !!(NV_RD32(par->PRAMDAC, 0x083C) & 1);

		printk(KERN_INFO PFX "Flat panel dithering %s\n",

		       par->FPDither ? "enabled" : "disabled");

		       str_enabled_disabled(par->FPDither));

	}



	info->fix.visual = (info->var.bits_per_pixel == 8) ?

drivers/video/fbdev/pxafb.c

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <linux/soc/pxa/cpu.h>

#include <video/of_display_timing.h>

#include <video/videomode.h>

#include <linux/string_choices.h>



#include <asm/io.h>

#include <asm/irq.h>
@@ -1419,7 +1420,7 @@ static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on) 


		if (ret < 0)

			pr_warn("Unable to %s LCD supply regulator: %d\n",

				on ? "enable" : "disable", ret);

				str_enable_disable(on), ret);

		else

			fbi->lcd_supply_enabled = on;

	}