counter: stm32-timer-cnt: adopt signal definitions
authorFabrice Gasnier <fabrice.gasnier@foss.st.com>
Thu, 7 Mar 2024 13:32:59 +0000 (14:32 +0100)
committerWilliam Breathitt Gray <wbg@kernel.org>
Tue, 2 Apr 2024 17:10:34 +0000 (13:10 -0400)
Adopt signals definitions to ease later signals additions.
There are no intended functional changes here.

Reviewed-by: William Breathitt Gray <william.gray@linaro.org>
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Link: https://lore.kernel.org/r/20240307133306.383045-4-fabrice.gasnier@foss.st.com
Signed-off-by: William Breathitt Gray <william.gray@linaro.org>
drivers/counter/stm32-timer-cnt.c

index 668e9d1061d3befa6235afc56441c43997370044..c34747d7857e16833ded4d549a4d1413b0219c37 100644 (file)
@@ -21,6 +21,9 @@
 #define TIM_CCER_MASK  (TIM_CCER_CC1P | TIM_CCER_CC1NP | \
                         TIM_CCER_CC2P | TIM_CCER_CC2NP)
 
+#define STM32_CH1_SIG          0
+#define STM32_CH2_SIG          1
+
 struct stm32_timer_regs {
        u32 cr1;
        u32 cnt;
@@ -247,14 +250,14 @@ static int stm32_action_read(struct counter_device *counter,
                return 0;
        case COUNTER_FUNCTION_QUADRATURE_X2_A:
                /* counts up/down on TI1FP1 edge depending on TI2FP2 level */
-               if (synapse->signal->id == count->synapses[0].signal->id)
+               if (synapse->signal->id == STM32_CH1_SIG)
                        *action = COUNTER_SYNAPSE_ACTION_BOTH_EDGES;
                else
                        *action = COUNTER_SYNAPSE_ACTION_NONE;
                return 0;
        case COUNTER_FUNCTION_QUADRATURE_X2_B:
                /* counts up/down on TI2FP2 edge depending on TI1FP1 level */
-               if (synapse->signal->id == count->synapses[1].signal->id)
+               if (synapse->signal->id == STM32_CH2_SIG)
                        *action = COUNTER_SYNAPSE_ACTION_BOTH_EDGES;
                else
                        *action = COUNTER_SYNAPSE_ACTION_NONE;
@@ -278,11 +281,11 @@ static const struct counter_ops stm32_timer_cnt_ops = {
 
 static struct counter_signal stm32_signals[] = {
        {
-               .id = 0,
+               .id = STM32_CH1_SIG,
                .name = "Channel 1"
        },
        {
-               .id = 1,
+               .id = STM32_CH2_SIG,
                .name = "Channel 2"
        }
 };
@@ -291,12 +294,12 @@ static struct counter_synapse stm32_count_synapses[] = {
        {
                .actions_list = stm32_synapse_actions,
                .num_actions = ARRAY_SIZE(stm32_synapse_actions),
-               .signal = &stm32_signals[0]
+               .signal = &stm32_signals[STM32_CH1_SIG]
        },
        {
                .actions_list = stm32_synapse_actions,
                .num_actions = ARRAY_SIZE(stm32_synapse_actions),
-               .signal = &stm32_signals[1]
+               .signal = &stm32_signals[STM32_CH2_SIG]
        }
 };