fbdev: Use string choices helpers

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

Signed-off-by: Chelsy Ratnawat <chelsyratnawat2001@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 3b779c27c2711eb5b5120673d302d975194f13f0..0a65bef01e3c0166c23d6c35939fbe916ac21116 100644 (file)
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -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)

diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
index cfaf9454014d8161bedc3598fb68855e04ea9408..72b85f475605dd45960d76ec7495bb0f26f944a3 100644 (file)
--- a/drivers/video/fbdev/nvidia/nvidia.c
+++ b/drivers/video/fbdev/nvidia/nvidia.c
@@ -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) ?

diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index baf87f34cc24bbdb2177356d02edcd7cdbddb2e3..b96a8a96bce8d18c718dca6d6d63d1e5be702434 100644 (file)
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -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;
        }