hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

counter: Rename counter_signal_value to counter_signal_level 

Signal values will always be levels so let's be explicit it about it to
make the intent of the code clear.

Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: Kamel Bouhara <kamel.bouhara@bootlin.com>
Acked-by: Syed Nayyar Waris <syednwaris@gmail.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Link: https://lore.kernel.org/r/3f17010abe2415859cea9a5fddabd3c97f635ff5.1627990337.git.vilhelm.gray@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
William Breathitt Gray 2021-08-03 21:06:14 +09:00 committed by Jonathan Cameron
parent e2ff3198c5
commit 493b938a14
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/counter/104-quad-8.c
View File

@ -97,7 +97,8 @@ struct quad8 {
#define QUAD8_CMR_QUADRATURE_X4 0x18 #define QUAD8_CMR_QUADRATURE_X4 0x18
static int quad8_signal_read(struct counter_device *counter, static int quad8_signal_read(struct counter_device *counter,
struct counter_signal *signal, enum counter_signal_value *val) struct counter_signal *signal,
enum counter_signal_level *level)
{ {
const struct quad8 *const priv = counter->priv; const struct quad8 *const priv = counter->priv;
unsigned int state; unsigned int state;
@ -109,7 +110,7 @@ static int quad8_signal_read(struct counter_device *counter,
state = inb(priv->base + QUAD8_REG_INDEX_INPUT_LEVELS) state = inb(priv->base + QUAD8_REG_INDEX_INPUT_LEVELS)
& BIT(signal->id - 16); & BIT(signal->id - 16);
*val = (state) ? COUNTER_SIGNAL_HIGH : COUNTER_SIGNAL_LOW; *level = (state) ? COUNTER_SIGNAL_LEVEL_HIGH : COUNTER_SIGNAL_LEVEL_LOW;
return 0; return 0;
} }

12
drivers/counter/counter.c
View File

@ -289,9 +289,9 @@ struct counter_signal_unit {
struct counter_signal *signal; struct counter_signal *signal;
}; };
static const char *const counter_signal_value_str[] = { static const char *const counter_signal_level_str[] = {
[COUNTER_SIGNAL_LOW] = "low", [COUNTER_SIGNAL_LEVEL_LOW] = "low",
[COUNTER_SIGNAL_HIGH] = "high" [COUNTER_SIGNAL_LEVEL_HIGH] = "high"
}; };
static ssize_t counter_signal_show(struct device *dev, 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; const struct counter_signal_unit *const component = devattr->component;
struct counter_signal *const signal = component->signal; struct counter_signal *const signal = component->signal;
int err; 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) if (err)
return 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 { struct counter_name_unit {

4
drivers/counter/interrupt-cnt.c
View File

@ -130,7 +130,7 @@ static int interrupt_cnt_function_get(struct counter_device *counter,
static int interrupt_cnt_signal_read(struct counter_device *counter, static int interrupt_cnt_signal_read(struct counter_device *counter,
struct counter_signal *signal, struct counter_signal *signal,
enum counter_signal_value *val) enum counter_signal_level *level)
{ {
struct interrupt_cnt_priv *priv = counter->priv; struct interrupt_cnt_priv *priv = counter->priv;
int ret; int ret;
@ -142,7 +142,7 @@ static int interrupt_cnt_signal_read(struct counter_device *counter,
if (ret < 0) if (ret < 0)
return ret; return ret;
*val = ret ? COUNTER_SIGNAL_HIGH : COUNTER_SIGNAL_LOW; *level = ret ? COUNTER_SIGNAL_LEVEL_HIGH : COUNTER_SIGNAL_LEVEL_LOW;
return 0; return 0;
} }

4
drivers/counter/microchip-tcb-capture.c
View File

@ -158,7 +158,7 @@ static int mchp_tc_count_function_set(struct counter_device *counter,
static int mchp_tc_count_signal_read(struct counter_device *counter, static int mchp_tc_count_signal_read(struct counter_device *counter,
struct counter_signal *signal, struct counter_signal *signal,
enum counter_signal_value *val) enum counter_signal_level *lvl)
{ {
struct mchp_tc_data *const priv = counter->priv; struct mchp_tc_data *const priv = counter->priv;
bool sigstatus; bool sigstatus;
@ -171,7 +171,7 @@ static int mchp_tc_count_signal_read(struct counter_device *counter,
else else
sigstatus = (sr & ATMEL_TC_MTIOA); sigstatus = (sr & ATMEL_TC_MTIOA);
*val = sigstatus ? COUNTER_SIGNAL_HIGH : COUNTER_SIGNAL_LOW; *lvl = sigstatus ? COUNTER_SIGNAL_LEVEL_HIGH : COUNTER_SIGNAL_LEVEL_LOW;
return 0; return 0;
} }

12
include/linux/counter.h
View File

@ -290,16 +290,16 @@ struct counter_device_state {
const struct attribute_group **groups; const struct attribute_group **groups;
}; };
enum counter_signal_value { enum counter_signal_level {
COUNTER_SIGNAL_LOW = 0, COUNTER_SIGNAL_LEVEL_LOW,
COUNTER_SIGNAL_HIGH COUNTER_SIGNAL_LEVEL_HIGH,
}; };
/** /**
* struct counter_ops - Callbacks from driver * struct counter_ops - Callbacks from driver
* @signal_read: optional read callback for Signal attribute. The read * @signal_read: optional read callback for Signal attribute. The read
* value of the respective Signal should be passed back via * level of the respective Signal should be passed back via
* the val parameter. * the level parameter.
* @count_read: optional read callback for Count attribute. The read * @count_read: optional read callback for Count attribute. The read
* value of the respective Count should be passed back via * value of the respective Count should be passed back via
* the val parameter. * the val parameter.
@ -324,7 +324,7 @@ enum counter_signal_value {
struct counter_ops { struct counter_ops {
int (*signal_read)(struct counter_device *counter, int (*signal_read)(struct counter_device *counter,
struct counter_signal *signal, struct counter_signal *signal,
enum counter_signal_value *val); enum counter_signal_level *level);
int (*count_read)(struct counter_device *counter, int (*count_read)(struct counter_device *counter,
struct counter_count *count, unsigned long *val); struct counter_count *count, unsigned long *val);
int (*count_write)(struct counter_device *counter, int (*count_write)(struct counter_device *counter,