PM / devfreq: Define the constant governor name

Prior to that, the devfreq device uses the governor name when adding
the itself. In order to prevent the mistake used the wrong governor name,
this patch defines the governor name as a constant and then uses them
instead of using the string directly.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org

diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c
index 49f68929e024fa9fc95b8f31eda07edd5218bb53..c25658b265988b4fdd2a3f4304fdbfab83b7b9f3 100644 (file)
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@ -436,7 +436,8 @@ static int exynos_bus_probe(struct platform_device *pdev)
        ondemand_data->downdifferential = 5;
 
        /* Add devfreq device to monitor and handle the exynos bus */
-       bus->devfreq = devm_devfreq_add_device(dev, profile, "simple_ondemand",
+       bus->devfreq = devm_devfreq_add_device(dev, profile,
+                                               DEVFREQ_GOV_SIMPLE_ONDEMAND,
                                                ondemand_data);
        if (IS_ERR(bus->devfreq)) {
                dev_err(dev, "failed to add devfreq device\n");
@@ -488,7 +489,7 @@ passive:
        passive_data->parent = parent_devfreq;
 
        /* Add devfreq device for exynos bus with passive governor */
-       bus->devfreq = devm_devfreq_add_device(dev, profile, "passive",
+       bus->devfreq = devm_devfreq_add_device(dev, profile, DEVFREQ_GOV_PASSIVE,
                                                passive_data);
        if (IS_ERR(bus->devfreq)) {
                dev_err(dev,

diff --git a/drivers/devfreq/governor_passive.c b/drivers/devfreq/governor_passive.c
index 673ad8cc9a1d093e3db6e2d335742a1aee529953..3bc29acbd54e85480d375514fd56e2878681fa96 100644 (file)
--- a/drivers/devfreq/governor_passive.c
+++ b/drivers/devfreq/governor_passive.c
@@ -183,7 +183,7 @@ static int devfreq_passive_event_handler(struct devfreq *devfreq,
 }
 
 static struct devfreq_governor devfreq_passive = {
-       .name = "passive",
+       .name = DEVFREQ_GOV_PASSIVE,
        .immutable = 1,
        .get_target_freq = devfreq_passive_get_target_freq,
        .event_handler = devfreq_passive_event_handler,

diff --git a/drivers/devfreq/governor_performance.c b/drivers/devfreq/governor_performance.c
index c72f942f30a85a198b89514703b485d9f790867b..4d23ecfbd948eb7811288ec90920527d9393c9a8 100644 (file)
--- a/drivers/devfreq/governor_performance.c
+++ b/drivers/devfreq/governor_performance.c
@@ -42,7 +42,7 @@ static int devfreq_performance_handler(struct devfreq *devfreq,
 }
 
 static struct devfreq_governor devfreq_performance = {
-       .name = "performance",
+       .name = DEVFREQ_GOV_PERFORMANCE,
        .get_target_freq = devfreq_performance_func,
        .event_handler = devfreq_performance_handler,
 };

diff --git a/drivers/devfreq/governor_powersave.c b/drivers/devfreq/governor_powersave.c
index 0c6bed567e6d4a12249f9891f06ed97411e118bc..0c42f23249ef6de7e4aa8a6c7693714a288b3c62 100644 (file)
--- a/drivers/devfreq/governor_powersave.c
+++ b/drivers/devfreq/governor_powersave.c
@@ -39,7 +39,7 @@ static int devfreq_powersave_handler(struct devfreq *devfreq,
 }
 
 static struct devfreq_governor devfreq_powersave = {
-       .name = "powersave",
+       .name = DEVFREQ_GOV_POWERSAVE,
        .get_target_freq = devfreq_powersave_func,
        .event_handler = devfreq_powersave_handler,
 };

diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c
index ae72ba5e78dfce046804a7dc5b7a08017d8a25c7..28e0f2de7100ee0cee83b1e1179c750694b942af 100644 (file)
--- a/drivers/devfreq/governor_simpleondemand.c
+++ b/drivers/devfreq/governor_simpleondemand.c
@@ -125,7 +125,7 @@ static int devfreq_simple_ondemand_handler(struct devfreq *devfreq,
 }
 
 static struct devfreq_governor devfreq_simple_ondemand = {
-       .name = "simple_ondemand",
+       .name = DEVFREQ_GOV_SIMPLE_ONDEMAND,
        .get_target_freq = devfreq_simple_ondemand_func,
        .event_handler = devfreq_simple_ondemand_handler,
 };

diff --git a/drivers/devfreq/governor_userspace.c b/drivers/devfreq/governor_userspace.c
index 77028c27593c635d821fab28eea57c0084a89346..080607c3f34d62433365b57b0fd0fa196eb9b96c 100644 (file)
--- a/drivers/devfreq/governor_userspace.c
+++ b/drivers/devfreq/governor_userspace.c
@@ -87,7 +87,7 @@ static struct attribute *dev_entries[] = {
        NULL,
 };
 static const struct attribute_group dev_attr_group = {
-       .name   = "userspace",
+       .name   = DEVFREQ_GOV_USERSPACE,
        .attrs  = dev_entries,
 };
 

diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
index 1b89ebbad02c0a3d546587b74ea32aef11df1884..5dfbfa3cc878f0d295a55a93cfeb9e581f56a377 100644 (file)
--- a/drivers/devfreq/rk3399_dmc.c
+++ b/drivers/devfreq/rk3399_dmc.c
@@ -431,7 +431,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 
        data->devfreq = devm_devfreq_add_device(dev,
                                           &rk3399_devfreq_dmc_profile,
-                                          "simple_ondemand",
+                                          DEVFREQ_GOV_SIMPLE_ONDEMAND,
                                           &data->ondemand_data);
        if (IS_ERR(data->devfreq))
                return PTR_ERR(data->devfreq);

diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index 19520625ea94e694e3e62b1dfb327bd0bfeb0616..3aae5b3af87cf0436d855ff4a355fa1c9b534ce4 100644 (file)
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -19,6 +19,13 @@
 
 #define DEVFREQ_NAME_LEN 16
 
+/* DEVFREQ governor name */
+#define DEVFREQ_GOV_SIMPLE_ONDEMAND    "simple_ondemand"
+#define DEVFREQ_GOV_PERFORMANCE                "performance"
+#define DEVFREQ_GOV_POWERSAVE          "powersave"
+#define DEVFREQ_GOV_USERSPACE          "userspace"
+#define DEVFREQ_GOV_PASSIVE            "passive"
+
 /* DEVFREQ notifier interface */
 #define DEVFREQ_TRANSITION_NOTIFIER    (0)