Commit 493b938a authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Jonathan Cameron
Browse files

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: default avatarSyed Nayyar Waris <syednwaris@gmail.com>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Link: https://lore.kernel.org/r/3f17010abe2415859cea9a5fddabd3c97f635ff5.1627990337.git.vilhelm.gray@gmail.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent e2ff3198

drivers/counter/104-quad-8.c

+3 −2
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ struct quad8 { 
#define QUAD8_CMR_QUADRATURE_X4 0x18



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;

	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)

		& BIT(signal->id - 16);



	*val = (state) ? COUNTER_SIGNAL_HIGH : COUNTER_SIGNAL_LOW;

	*level = (state) ? COUNTER_SIGNAL_LEVEL_HIGH : COUNTER_SIGNAL_LEVEL_LOW;



	return 0;

}

drivers/counter/counter.c

+6 −6
Original line number Diff line number Diff line
@@ -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 {

drivers/counter/interrupt-cnt.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int interrupt_cnt_function_get(struct counter_device *counter, 


static int interrupt_cnt_signal_read(struct counter_device *counter,

				     struct counter_signal *signal,

				     enum counter_signal_value *val)

				     enum counter_signal_level *level)

{

	struct interrupt_cnt_priv *priv = counter->priv;

	int ret;
@@ -142,7 +142,7 @@ static int interrupt_cnt_signal_read(struct counter_device *counter, 
	if (ret < 0)

		return ret;



	*val = ret ? COUNTER_SIGNAL_HIGH : COUNTER_SIGNAL_LOW;

	*level = ret ? COUNTER_SIGNAL_LEVEL_HIGH : COUNTER_SIGNAL_LEVEL_LOW;



	return 0;

}

drivers/counter/microchip-tcb-capture.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

				     struct counter_signal *signal,

				     enum counter_signal_value *val)

				     enum counter_signal_level *lvl)

{

	struct mchp_tc_data *const priv = counter->priv;

	bool sigstatus;
@@ -171,7 +171,7 @@ static int mchp_tc_count_signal_read(struct counter_device *counter, 
	else

		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;

}

include/linux/counter.h

+6 −6
Original line number Diff line number Diff line
@@ -290,16 +290,16 @@ struct counter_device_state { 
	const struct attribute_group **groups;

};



enum counter_signal_value {

	COUNTER_SIGNAL_LOW = 0,

	COUNTER_SIGNAL_HIGH

enum counter_signal_level {

	COUNTER_SIGNAL_LEVEL_LOW,

	COUNTER_SIGNAL_LEVEL_HIGH,

};



/**

 * struct counter_ops - Callbacks from driver

 * @signal_read:	optional read callback for Signal attribute. The read

 *			value of the respective Signal should be passed back via

 *			the val parameter.

 *			level of the respective Signal should be passed back via

 *			the level parameter.

 * @count_read:		optional read callback for Count attribute. The read

 *			value of the respective Count should be passed back via

 *			the val parameter.
@@ -324,7 +324,7 @@ enum counter_signal_value { 
struct counter_ops {

	int (*signal_read)(struct counter_device *counter,

			   struct counter_signal *signal,

			   enum counter_signal_value *val);

			   enum counter_signal_level *level);

	int (*count_read)(struct counter_device *counter,

			  struct counter_count *count, unsigned long *val);

	int (*count_write)(struct counter_device *counter,