media: atomisp: 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: Sakari Ailus <sakari.ailus@linux.intel.com>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index c30501a36f8688ff76992ca87d89e7b9f91ae674..d2bacd1ffe7b6c09f61e3ac82ac9768abd7c360c 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -27,6 +27,7 @@
 
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
+#include <linux/string_choices.h>
 
 /* Assume max number of ACC stages */
 #define MAX_ACC_STAGES 20
@@ -841,7 +842,7 @@ int atomisp_css_irq_enable(struct atomisp_device *isp,
 {
        dev_dbg(isp->dev, "%s: css irq info 0x%08x: %s (%d).\n",
                __func__, info,
-               enable ? "enable" : "disable", enable);
+               str_enable_disable(enable), enable);
        if (ia_css_irq_enable(info, enable)) {
                dev_warn(isp->dev, "%s:Invalid irq info: 0x%08x when %s.\n",
                         __func__, info,

diff --git a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
index 2361227227039cdf419ceba44f39906d7b99f786..a1d3a16921eaa16106be17367b6db9778f71c3bc 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
@@ -12,6 +12,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/gpio/consumer.h>
 #include <linux/platform_device.h>
+#include <linux/string_choices.h>
 #include "../../include/linux/atomisp_platform.h"
 #include "../../include/linux/atomisp_gmin_platform.h"
 
@@ -916,7 +917,7 @@ static int gmin_acpi_pm_ctrl(struct v4l2_subdev *subdev, int on)
                return 0;
 
        dev_dbg(subdev->dev, "Setting power state to %s\n",
-               on ? "on" : "off");
+               str_on_off(on));
 
        if (on)
                ret = acpi_device_set_power(adev,
@@ -929,7 +930,7 @@ static int gmin_acpi_pm_ctrl(struct v4l2_subdev *subdev, int on)
                gs->clock_on = on;
        else
                dev_err(subdev->dev, "Couldn't set power state to %s\n",
-                       on ? "on" : "off");
+                       str_on_off(on));
 
        return ret;
 }

diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 900a67552d6a09389d2b8d688bf872aa89bcb12a..8122303974092c223a0f9875bb831e1ab1db5162 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -16,6 +16,7 @@
 #include <linux/dmi.h>
 #include <linux/interrupt.h>
 #include <linux/bits.h>
+#include <linux/string_choices.h>
 #include <media/v4l2-fwnode.h>
 
 #include <asm/iosf_mbi.h>
@@ -527,7 +528,7 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)
        u32 val = enable ? MRFLD_ISPSSPM0_IUNIT_POWER_ON :
                           MRFLD_ISPSSPM0_IUNIT_POWER_OFF;
 
-       dev_dbg(isp->dev, "IUNIT power-%s.\n", enable ? "on" : "off");
+       dev_dbg(isp->dev, "IUNIT power-%s.\n", str_on_off(enable));
 
        /* WA for P-Unit, if DVFS enabled, ISP timeout observed */
        if (IS_CHT && enable && !isp->pm_only) {
@@ -569,7 +570,7 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)
                usleep_range(100, 150);
        } while (1);
 
-       dev_err(isp->dev, "IUNIT power-%s timeout.\n", enable ? "on" : "off");
+       dev_err(isp->dev, "IUNIT power-%s timeout.\n", str_on_off(enable));
        return -EBUSY;
 }
 

diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
index 39b37b557affe9bf39a3a597ae8e11dc4af522d2..e9016d7775dc3f641d8a49ac87a6692dd72a49ec 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/math.h>
+#include <linux/string_choices.h>
 
 #include <math_support.h>
 #include <gdc_device.h>        /* HR_GDC_N */
@@ -1220,7 +1221,7 @@ int ia_css_binary_find(struct ia_css_binary_descr *descr, struct ia_css_binary *
                dev_dbg(atomisp_dev, "Using binary %s (id %d), type %d, mode %d, continuous %s\n",
                        xcandidate->blob->name, xcandidate->sp.id, xcandidate->type,
                        xcandidate->sp.pipeline.mode,
-                       xcandidate->sp.enable.continuous ? "true" : "false");
+                       str_true_false(xcandidate->sp.enable.continuous));
 
        if (err)
                dev_err(atomisp_dev, "Failed to find a firmware binary matching the pipeline parameters\n");

diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index 792379407828a42adae3f0675e5b5943d3ee5ce1..c136c1745eb93aaaffe5e4b9c5ee2607234d43ff 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -7,6 +7,7 @@
 /*! \file */
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 #include <linux/vmalloc.h>
 
 #include "hmm.h"
@@ -1478,7 +1479,7 @@ map_sp_threads(struct ia_css_stream *stream, bool map)
        enum ia_css_pipe_id pipe_id;
 
        IA_CSS_ENTER_PRIVATE("stream = %p, map = %s",
-                            stream, map ? "true" : "false");
+                            stream, str_true_false(map));
 
        if (!stream) {
                IA_CSS_LEAVE_ERR_PRIVATE(-EINVAL);