From: William Breathitt Gray <vilhelm.gray@gmail.com> To: jic23@kernel.org Cc: kernel@pengutronix.de, linux-stm32@st-md-mailman.stormreply.com, a.fatoum@pengutronix.de, kamel.bouhara@bootlin.com, gwendal@chromium.org, alexandre.belloni@bootlin.com, david@lechnology.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, syednwaris@gmail.com, patrick.havelange@essensium.com, fabrice.gasnier@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, o.rempel@pengutronix.de, William Breathitt Gray <vilhelm.gray@gmail.com> Subject: [PATCH v8 09/22] counter: Return error code on invalid modes Date: Fri, 12 Feb 2021 21:13:33 +0900 [thread overview] Message-ID: <58e7c59bb7c7bb94c8655903308842d9d9e9907a.1613131238.git.vilhelm.gray@gmail.com> (raw) In-Reply-To: <cover.1613131238.git.vilhelm.gray@gmail.com> Only a select set of modes (function, action, etc.) are valid for a given device configuration. This patch ensures that invalid modes result in a return -EINVAL. Such a situation should never occur in reality, but it's good to define a default switch cases for the sake of making the intent of the code clear. Cc: Syed Nayyar Waris <syednwaris@gmail.com> Cc: Kamel Bouhara <kamel.bouhara@bootlin.com> Cc: Fabrice Gasnier <fabrice.gasnier@st.com> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Cc: David Lechner <david@lechnology.com> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- drivers/counter/104-quad-8.c | 10 ++++++++++ drivers/counter/microchip-tcb-capture.c | 6 ++++++ drivers/counter/stm32-lptimer-cnt.c | 10 ++++++---- drivers/counter/stm32-timer-cnt.c | 3 +++ drivers/counter/ti-eqep.c | 3 +++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c index 9a96296b0625..674263b4d2c4 100644 --- a/drivers/counter/104-quad-8.c +++ b/drivers/counter/104-quad-8.c @@ -273,6 +273,10 @@ static int quad8_function_set(struct counter_device *counter, *scale = 2; mode_cfg |= QUAD8_CMR_QUADRATURE_X4; break; + default: + /* should never reach this path */ + mutex_unlock(&priv->lock); + return -EINVAL; } } @@ -367,6 +371,9 @@ static int quad8_action_get(struct counter_device *counter, case QUAD8_COUNT_FUNCTION_QUADRATURE_X4: *action = QUAD8_SYNAPSE_ACTION_BOTH_EDGES; break; + default: + /* should never reach this path */ + return -EINVAL; } return 0; @@ -529,6 +536,9 @@ static int quad8_count_mode_set(struct counter_device *counter, case COUNTER_COUNT_MODE_MODULO_N: cnt_mode = 3; break; + default: + /* should never reach this path */ + return -EINVAL; } mutex_lock(&priv->lock); diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c index 710acc0a3704..ee979b011012 100644 --- a/drivers/counter/microchip-tcb-capture.c +++ b/drivers/counter/microchip-tcb-capture.c @@ -133,6 +133,9 @@ static int mchp_tc_count_function_set(struct counter_device *counter, bmr |= ATMEL_TC_QDEN | ATMEL_TC_POSEN; cmr |= ATMEL_TC_ETRGEDG_RISING | ATMEL_TC_ABETRG | ATMEL_TC_XC0; break; + default: + /* should never reach this path */ + return -EINVAL; } regmap_write(priv->regmap, ATMEL_TC_BMR, bmr); @@ -226,6 +229,9 @@ static int mchp_tc_count_action_set(struct counter_device *counter, case MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE: edge = ATMEL_TC_ETRGEDG_BOTH; break; + default: + /* should never reach this path */ + return -EINVAL; } return regmap_write_bits(priv->regmap, diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c index 937439635d53..daf988e7b208 100644 --- a/drivers/counter/stm32-lptimer-cnt.c +++ b/drivers/counter/stm32-lptimer-cnt.c @@ -206,9 +206,10 @@ static int stm32_lptim_cnt_function_set(struct counter_device *counter, priv->quadrature_mode = 1; priv->polarity = STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES; return 0; + default: + /* should never reach this path */ + return -EINVAL; } - - return -EINVAL; } static ssize_t stm32_lptim_cnt_enable_read(struct counter_device *counter, @@ -326,9 +327,10 @@ static int stm32_lptim_cnt_action_get(struct counter_device *counter, case STM32_LPTIM_ENCODER_BOTH_EDGE: *action = priv->polarity; return 0; + default: + /* should never reach this path */ + return -EINVAL; } - - return -EINVAL; } static int stm32_lptim_cnt_action_set(struct counter_device *counter, diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c index ef2a974a2f10..431a3d08ed6c 100644 --- a/drivers/counter/stm32-timer-cnt.c +++ b/drivers/counter/stm32-timer-cnt.c @@ -296,6 +296,9 @@ static int stm32_action_get(struct counter_device *counter, /* counts up/down on both TI1FP1 and TI2FP2 edges */ *action = STM32_SYNAPSE_ACTION_BOTH_EDGES; break; + default: + /* should never reach this path */ + return -EINVAL; } return 0; diff --git a/drivers/counter/ti-eqep.c b/drivers/counter/ti-eqep.c index a60aee1a1a29..7844fdf78a97 100644 --- a/drivers/counter/ti-eqep.c +++ b/drivers/counter/ti-eqep.c @@ -192,6 +192,9 @@ static int ti_eqep_action_get(struct counter_device *counter, break; } break; + default: + /* should never reach this path */ + return -EINVAL; } return 0; -- 2.30.0
WARNING: multiple messages have this Message-ID (diff)
From: William Breathitt Gray <vilhelm.gray@gmail.com> To: jic23@kernel.org Cc: kamel.bouhara@bootlin.com, gwendal@chromium.org, a.fatoum@pengutronix.de, david@lechnology.com, linux-iio@vger.kernel.org, patrick.havelange@essensium.com, alexandre.belloni@bootlin.com, mcoquelin.stm32@gmail.com, linux-kernel@vger.kernel.org, o.rempel@pengutronix.de, kernel@pengutronix.de, William Breathitt Gray <vilhelm.gray@gmail.com>, fabrice.gasnier@st.com, syednwaris@gmail.com, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, alexandre.torgue@st.com Subject: [PATCH v8 09/22] counter: Return error code on invalid modes Date: Fri, 12 Feb 2021 21:13:33 +0900 [thread overview] Message-ID: <58e7c59bb7c7bb94c8655903308842d9d9e9907a.1613131238.git.vilhelm.gray@gmail.com> (raw) In-Reply-To: <cover.1613131238.git.vilhelm.gray@gmail.com> Only a select set of modes (function, action, etc.) are valid for a given device configuration. This patch ensures that invalid modes result in a return -EINVAL. Such a situation should never occur in reality, but it's good to define a default switch cases for the sake of making the intent of the code clear. Cc: Syed Nayyar Waris <syednwaris@gmail.com> Cc: Kamel Bouhara <kamel.bouhara@bootlin.com> Cc: Fabrice Gasnier <fabrice.gasnier@st.com> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Cc: David Lechner <david@lechnology.com> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- drivers/counter/104-quad-8.c | 10 ++++++++++ drivers/counter/microchip-tcb-capture.c | 6 ++++++ drivers/counter/stm32-lptimer-cnt.c | 10 ++++++---- drivers/counter/stm32-timer-cnt.c | 3 +++ drivers/counter/ti-eqep.c | 3 +++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c index 9a96296b0625..674263b4d2c4 100644 --- a/drivers/counter/104-quad-8.c +++ b/drivers/counter/104-quad-8.c @@ -273,6 +273,10 @@ static int quad8_function_set(struct counter_device *counter, *scale = 2; mode_cfg |= QUAD8_CMR_QUADRATURE_X4; break; + default: + /* should never reach this path */ + mutex_unlock(&priv->lock); + return -EINVAL; } } @@ -367,6 +371,9 @@ static int quad8_action_get(struct counter_device *counter, case QUAD8_COUNT_FUNCTION_QUADRATURE_X4: *action = QUAD8_SYNAPSE_ACTION_BOTH_EDGES; break; + default: + /* should never reach this path */ + return -EINVAL; } return 0; @@ -529,6 +536,9 @@ static int quad8_count_mode_set(struct counter_device *counter, case COUNTER_COUNT_MODE_MODULO_N: cnt_mode = 3; break; + default: + /* should never reach this path */ + return -EINVAL; } mutex_lock(&priv->lock); diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c index 710acc0a3704..ee979b011012 100644 --- a/drivers/counter/microchip-tcb-capture.c +++ b/drivers/counter/microchip-tcb-capture.c @@ -133,6 +133,9 @@ static int mchp_tc_count_function_set(struct counter_device *counter, bmr |= ATMEL_TC_QDEN | ATMEL_TC_POSEN; cmr |= ATMEL_TC_ETRGEDG_RISING | ATMEL_TC_ABETRG | ATMEL_TC_XC0; break; + default: + /* should never reach this path */ + return -EINVAL; } regmap_write(priv->regmap, ATMEL_TC_BMR, bmr); @@ -226,6 +229,9 @@ static int mchp_tc_count_action_set(struct counter_device *counter, case MCHP_TC_SYNAPSE_ACTION_BOTH_EDGE: edge = ATMEL_TC_ETRGEDG_BOTH; break; + default: + /* should never reach this path */ + return -EINVAL; } return regmap_write_bits(priv->regmap, diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c index 937439635d53..daf988e7b208 100644 --- a/drivers/counter/stm32-lptimer-cnt.c +++ b/drivers/counter/stm32-lptimer-cnt.c @@ -206,9 +206,10 @@ static int stm32_lptim_cnt_function_set(struct counter_device *counter, priv->quadrature_mode = 1; priv->polarity = STM32_LPTIM_SYNAPSE_ACTION_BOTH_EDGES; return 0; + default: + /* should never reach this path */ + return -EINVAL; } - - return -EINVAL; } static ssize_t stm32_lptim_cnt_enable_read(struct counter_device *counter, @@ -326,9 +327,10 @@ static int stm32_lptim_cnt_action_get(struct counter_device *counter, case STM32_LPTIM_ENCODER_BOTH_EDGE: *action = priv->polarity; return 0; + default: + /* should never reach this path */ + return -EINVAL; } - - return -EINVAL; } static int stm32_lptim_cnt_action_set(struct counter_device *counter, diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c index ef2a974a2f10..431a3d08ed6c 100644 --- a/drivers/counter/stm32-timer-cnt.c +++ b/drivers/counter/stm32-timer-cnt.c @@ -296,6 +296,9 @@ static int stm32_action_get(struct counter_device *counter, /* counts up/down on both TI1FP1 and TI2FP2 edges */ *action = STM32_SYNAPSE_ACTION_BOTH_EDGES; break; + default: + /* should never reach this path */ + return -EINVAL; } return 0; diff --git a/drivers/counter/ti-eqep.c b/drivers/counter/ti-eqep.c index a60aee1a1a29..7844fdf78a97 100644 --- a/drivers/counter/ti-eqep.c +++ b/drivers/counter/ti-eqep.c @@ -192,6 +192,9 @@ static int ti_eqep_action_get(struct counter_device *counter, break; } break; + default: + /* should never reach this path */ + return -EINVAL; } return 0; -- 2.30.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-12 12:16 UTC|newest] Thread overview: 139+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-12 12:13 [PATCH v8 00/22] Introduce the Counter character device interface William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 01/22] docs: counter: Consolidate Counter sysfs attributes documentation William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 16:57 ` Jonathan Cameron 2021-02-14 16:57 ` Jonathan Cameron 2021-02-15 11:05 ` William Breathitt Gray 2021-02-15 11:05 ` William Breathitt Gray 2021-02-20 16:25 ` David Lechner 2021-02-20 16:25 ` David Lechner 2021-02-12 12:13 ` [PATCH v8 02/22] docs: counter: Fix spelling William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-20 16:26 ` David Lechner 2021-02-20 16:26 ` David Lechner 2021-02-12 12:13 ` [PATCH v8 03/22] counter: 104-quad-8: Return error when invalid mode during ceiling_write William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-20 16:30 ` David Lechner 2021-02-20 16:30 ` David Lechner 2021-02-22 2:06 ` William Breathitt Gray 2021-02-22 2:06 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 04/22] counter: 104-quad-8: Annotate hardware config module parameter William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 05/22] counter: 104-quad-8: Add const qualifiers for quad8_preset_register_set William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 06/22] counter: 104-quad-8: Add const qualifier for functions_list array William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 07/22] counter: 104-quad-8: Add const qualifier for actions_list array William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 08/22] counter: ftm-quaddec: " William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray [this message] 2021-02-12 12:13 ` [PATCH v8 09/22] counter: Return error code on invalid modes William Breathitt Gray 2021-02-14 17:07 ` Jonathan Cameron 2021-02-14 17:07 ` Jonathan Cameron 2021-02-20 16:43 ` David Lechner 2021-02-20 16:43 ` David Lechner 2021-02-22 4:42 ` William Breathitt Gray 2021-02-22 4:42 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 10/22] counter: Standardize to ERANGE for limit exceeded errors William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 17:10 ` Jonathan Cameron 2021-02-14 17:10 ` Jonathan Cameron 2021-02-16 1:26 ` William Breathitt Gray 2021-02-16 1:26 ` William Breathitt Gray 2021-02-21 14:03 ` Jonathan Cameron 2021-02-21 14:03 ` Jonathan Cameron 2021-02-20 16:48 ` David Lechner 2021-02-20 16:48 ` David Lechner 2021-02-12 12:13 ` [PATCH v8 11/22] counter: Rename counter_signal_value to counter_signal_level William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-20 16:52 ` David Lechner 2021-02-20 16:52 ` David Lechner 2021-02-12 12:13 ` [PATCH v8 12/22] counter: Rename counter_count_function to counter_function William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 17:13 ` Jonathan Cameron 2021-02-14 17:13 ` Jonathan Cameron 2021-02-20 16:56 ` David Lechner 2021-02-20 16:56 ` David Lechner 2021-02-23 5:14 ` William Breathitt Gray 2021-02-23 5:14 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 13/22] counter: Internalize sysfs interface code William Breathitt Gray 2021-02-14 17:32 ` Jonathan Cameron 2021-02-14 17:32 ` Jonathan Cameron 2021-02-20 17:50 ` David Lechner 2021-02-20 17:50 ` David Lechner 2021-02-12 12:13 ` [PATCH v8 14/22] counter: Update counter.h comments to reflect sysfs internalization William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 15/22] docs: counter: Update " William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 16/22] counter: Move counter enums to uapi header William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-20 23:55 ` David Lechner 2021-02-20 23:55 ` David Lechner 2021-02-12 12:13 ` [PATCH v8 17/22] counter: Add character device interface William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 18:06 ` Jonathan Cameron 2021-02-14 18:06 ` Jonathan Cameron 2021-02-24 5:34 ` William Breathitt Gray 2021-02-24 5:34 ` William Breathitt Gray 2021-02-15 9:24 ` Oleksij Rempel 2021-02-15 9:24 ` Oleksij Rempel 2021-02-16 1:53 ` William Breathitt Gray 2021-02-16 1:53 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 18/22] docs: counter: Document " William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 17:48 ` Jonathan Cameron 2021-02-14 17:48 ` Jonathan Cameron 2021-02-22 10:11 ` Pavel Machek 2021-02-22 10:11 ` Pavel Machek 2021-02-26 0:27 ` William Breathitt Gray 2021-02-26 0:27 ` William Breathitt Gray 2021-02-26 0:22 ` William Breathitt Gray 2021-02-26 0:22 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 19/22] counter: Implement extension*_name sysfs attributes William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 18:09 ` Jonathan Cameron 2021-02-14 18:09 ` Jonathan Cameron 2021-02-19 8:51 ` William Breathitt Gray 2021-02-19 8:51 ` William Breathitt Gray 2021-02-21 14:05 ` Jonathan Cameron 2021-02-21 14:05 ` Jonathan Cameron 2021-02-25 23:32 ` William Breathitt Gray 2021-02-25 23:32 ` William Breathitt Gray 2021-02-27 15:14 ` Jonathan Cameron 2021-02-27 15:14 ` Jonathan Cameron 2021-02-12 12:13 ` [PATCH v8 20/22] counter: Implement events_queue_size sysfs attribute William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 18:11 ` Jonathan Cameron 2021-02-14 18:11 ` Jonathan Cameron 2021-02-18 10:32 ` William Breathitt Gray 2021-02-18 10:32 ` William Breathitt Gray 2021-02-21 15:51 ` Jonathan Cameron 2021-02-21 15:51 ` Jonathan Cameron 2021-02-26 0:03 ` William Breathitt Gray 2021-02-26 0:03 ` William Breathitt Gray 2021-02-27 0:14 ` David Lechner 2021-02-27 0:14 ` David Lechner 2021-02-27 0:20 ` William Breathitt Gray 2021-02-27 0:20 ` William Breathitt Gray 2021-02-27 15:18 ` Jonathan Cameron 2021-02-27 15:18 ` Jonathan Cameron 2021-02-28 2:46 ` William Breathitt Gray 2021-02-28 2:46 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 21/22] counter: 104-quad-8: Replace mutex with spinlock William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 18:19 ` Jonathan Cameron 2021-02-14 18:19 ` Jonathan Cameron 2021-02-16 2:16 ` William Breathitt Gray 2021-02-16 2:16 ` William Breathitt Gray 2021-02-16 19:27 ` Jonathan Cameron 2021-02-16 19:27 ` Jonathan Cameron 2021-02-18 10:16 ` William Breathitt Gray 2021-02-18 10:16 ` William Breathitt Gray 2021-02-12 12:13 ` [PATCH v8 22/22] counter: 104-quad-8: Add IRQ support for the ACCES 104-QUAD-8 William Breathitt Gray 2021-02-12 12:13 ` William Breathitt Gray 2021-02-14 18:24 ` Jonathan Cameron 2021-02-14 18:24 ` Jonathan Cameron 2021-02-19 9:21 ` William Breathitt Gray 2021-02-19 9:21 ` William Breathitt Gray
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=58e7c59bb7c7bb94c8655903308842d9d9e9907a.1613131238.git.vilhelm.gray@gmail.com \ --to=vilhelm.gray@gmail.com \ --cc=a.fatoum@pengutronix.de \ --cc=alexandre.belloni@bootlin.com \ --cc=alexandre.torgue@st.com \ --cc=david@lechnology.com \ --cc=fabrice.gasnier@st.com \ --cc=gwendal@chromium.org \ --cc=jic23@kernel.org \ --cc=kamel.bouhara@bootlin.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=o.rempel@pengutronix.de \ --cc=patrick.havelange@essensium.com \ --cc=syednwaris@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.