Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / counter / counter.c

diff --git a/drivers/counter/counter.c b/drivers/counter/counter.c
index 6a683d0..de921e8 100644 (file)
--- a/drivers/counter/counter.c
+++ b/drivers/counter/counter.c
@@ -289,9 +289,9 @@ struct counter_signal_unit {
        struct counter_signal *signal;
 };
 
-static const char *const counter_signal_value_str[] = {
-       [COUNTER_SIGNAL_LOW] = "low",
-       [COUNTER_SIGNAL_HIGH] = "high"
+static const char *const counter_signal_level_str[] = {
+       [COUNTER_SIGNAL_LEVEL_LOW] = "low",
+       [COUNTER_SIGNAL_LEVEL_HIGH] = "high"
 };
 
 static ssize_t counter_signal_show(struct device *dev,
@@ -302,13 +302,13 @@ static ssize_t counter_signal_show(struct device *dev,
        const struct counter_signal_unit *const component = devattr->component;
        struct counter_signal *const signal = component->signal;
        int err;
-       enum counter_signal_value val;
+       enum counter_signal_level level;
 
-       err = counter->ops->signal_read(counter, signal, &val);
+       err = counter->ops->signal_read(counter, signal, &level);
        if (err)
                return err;
 
-       return sprintf(buf, "%s\n", counter_signal_value_str[val]);
+       return sprintf(buf, "%s\n", counter_signal_level_str[level]);
 }
 
 struct counter_name_unit {
@@ -744,15 +744,15 @@ static ssize_t counter_count_store(struct device *dev,
        return len;
 }
 
-static const char *const counter_count_function_str[] = {
-       [COUNTER_COUNT_FUNCTION_INCREASE] = "increase",
-       [COUNTER_COUNT_FUNCTION_DECREASE] = "decrease",
-       [COUNTER_COUNT_FUNCTION_PULSE_DIRECTION] = "pulse-direction",
-       [COUNTER_COUNT_FUNCTION_QUADRATURE_X1_A] = "quadrature x1 a",
-       [COUNTER_COUNT_FUNCTION_QUADRATURE_X1_B] = "quadrature x1 b",
-       [COUNTER_COUNT_FUNCTION_QUADRATURE_X2_A] = "quadrature x2 a",
-       [COUNTER_COUNT_FUNCTION_QUADRATURE_X2_B] = "quadrature x2 b",
-       [COUNTER_COUNT_FUNCTION_QUADRATURE_X4] = "quadrature x4"
+static const char *const counter_function_str[] = {
+       [COUNTER_FUNCTION_INCREASE] = "increase",
+       [COUNTER_FUNCTION_DECREASE] = "decrease",
+       [COUNTER_FUNCTION_PULSE_DIRECTION] = "pulse-direction",
+       [COUNTER_FUNCTION_QUADRATURE_X1_A] = "quadrature x1 a",
+       [COUNTER_FUNCTION_QUADRATURE_X1_B] = "quadrature x1 b",
+       [COUNTER_FUNCTION_QUADRATURE_X2_A] = "quadrature x2 a",
+       [COUNTER_FUNCTION_QUADRATURE_X2_B] = "quadrature x2 b",
+       [COUNTER_FUNCTION_QUADRATURE_X4] = "quadrature x4"
 };
 
 static ssize_t counter_function_show(struct device *dev,
@@ -764,7 +764,7 @@ static ssize_t counter_function_show(struct device *dev,
        const struct counter_count_unit *const component = devattr->component;
        struct counter_count *const count = component->count;
        size_t func_index;
-       enum counter_count_function function;
+       enum counter_function function;
 
        err = counter->ops->function_get(counter, count, &func_index);
        if (err)
@@ -773,7 +773,7 @@ static ssize_t counter_function_show(struct device *dev,
        count->function = func_index;
 
        function = count->functions_list[func_index];
-       return sprintf(buf, "%s\n", counter_count_function_str[function]);
+       return sprintf(buf, "%s\n", counter_function_str[function]);
 }
 
 static ssize_t counter_function_store(struct device *dev,
@@ -785,14 +785,14 @@ static ssize_t counter_function_store(struct device *dev,
        struct counter_count *const count = component->count;
        const size_t num_functions = count->num_functions;
        size_t func_index;
-       enum counter_count_function function;
+       enum counter_function function;
        int err;
        struct counter_device *const counter = dev_get_drvdata(dev);
 
        /* Find requested Count function mode */
        for (func_index = 0; func_index < num_functions; func_index++) {
                function = count->functions_list[func_index];
-               if (sysfs_streq(buf, counter_count_function_str[function]))
+               if (sysfs_streq(buf, counter_function_str[function]))
                        break;
        }
        /* Return error if requested Count function mode not found */
@@ -880,25 +880,25 @@ err_free_attr_list:
 }
 
 struct counter_func_avail_unit {
-       const enum counter_count_function *functions_list;
+       const enum counter_function *functions_list;
        size_t num_functions;
 };
 
-static ssize_t counter_count_function_available_show(struct device *dev,
+static ssize_t counter_function_available_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
        const struct counter_device_attr *const devattr = to_counter_attr(attr);
        const struct counter_func_avail_unit *const component = devattr->component;
-       const enum counter_count_function *const func_list = component->functions_list;
+       const enum counter_function *const func_list = component->functions_list;
        const size_t num_functions = component->num_functions;
        size_t i;
-       enum counter_count_function function;
+       enum counter_function function;
        ssize_t len = 0;
 
        for (i = 0; i < num_functions; i++) {
                function = func_list[i];
                len += sprintf(buf + len, "%s\n",
-                              counter_count_function_str[function]);
+                              counter_function_str[function]);
        }
 
        return len;
@@ -968,7 +968,7 @@ static int counter_count_attributes_create(
        parm.group = group;
        parm.prefix = "";
        parm.name = "function_available";
-       parm.show = counter_count_function_available_show;
+       parm.show = counter_function_available_show;
        parm.store = NULL;
        parm.component = avail_comp;
        err = counter_attribute_create(&parm);