From: William Breathitt Gray <vilhelm.gray@gmail.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
kernel@pengutronix.de,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
linux-iio@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
Syed Nayyar Waris <syednwaris@gmail.com>
Subject: Re: [PATCH v2 05/23] counter: 104-quad-8: Convert to counter_priv() wrapper
Date: Wed, 29 Dec 2021 16:27:33 +0900 [thread overview]
Message-ID: <YcwN5e7zjNLANT6d@shinobu> (raw)
In-Reply-To: <20211227094526.698714-6-u.kleine-koenig@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 12368 bytes --]
On Mon, Dec 27, 2021 at 10:45:08AM +0100, Uwe Kleine-König wrote:
> This is a straight forward conversion to the new counter_priv() wrapper.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This patch results in a minor merge conflict with commit c95cc0d95702
("counter: 104-quad-8: Fix persistent enabled events bug") in linux-next
due to context changes in quad8_events_configure() and
quad8_watch_validate(). Fixing this after a rebase is trivial so I'll
give my Ack here.
Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com>
> ---
> drivers/counter/104-quad-8.c | 58 ++++++++++++++++++------------------
> 1 file changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c
> index 1cbd60aaed69..6e5286cd1d4e 100644
> --- a/drivers/counter/104-quad-8.c
> +++ b/drivers/counter/104-quad-8.c
> @@ -113,7 +113,7 @@ static int quad8_signal_read(struct counter_device *counter,
> struct counter_signal *signal,
> enum counter_signal_level *level)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
> unsigned int state;
>
> /* Only Index signal levels can be read */
> @@ -131,7 +131,7 @@ static int quad8_signal_read(struct counter_device *counter,
> static int quad8_count_read(struct counter_device *counter,
> struct counter_count *count, u64 *val)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const int base_offset = priv->base + 2 * count->id;
> unsigned int flags;
> unsigned int borrow;
> @@ -163,7 +163,7 @@ static int quad8_count_read(struct counter_device *counter,
> static int quad8_count_write(struct counter_device *counter,
> struct counter_count *count, u64 val)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const int base_offset = priv->base + 2 * count->id;
> unsigned long irqflags;
> int i;
> @@ -213,7 +213,7 @@ static int quad8_function_read(struct counter_device *counter,
> struct counter_count *count,
> enum counter_function *function)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const int id = count->id;
> unsigned long irqflags;
>
> @@ -243,7 +243,7 @@ static int quad8_function_write(struct counter_device *counter,
> struct counter_count *count,
> enum counter_function function)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const int id = count->id;
> unsigned int *const quadrature_mode = priv->quadrature_mode + id;
> unsigned int *const scale = priv->quadrature_scale + id;
> @@ -305,7 +305,7 @@ static int quad8_direction_read(struct counter_device *counter,
> struct counter_count *count,
> enum counter_count_direction *direction)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
> unsigned int ud_flag;
> const unsigned int flag_addr = priv->base + 2 * count->id + 1;
>
> @@ -335,7 +335,7 @@ static int quad8_action_read(struct counter_device *counter,
> struct counter_synapse *synapse,
> enum counter_synapse_action *action)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> int err;
> enum counter_function function;
> const size_t signal_a_id = count->synapses[0].signal->id;
> @@ -399,7 +399,7 @@ enum {
>
> static int quad8_events_configure(struct counter_device *counter)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> unsigned long irq_enabled = 0;
> unsigned long irqflags;
> size_t channel;
> @@ -442,7 +442,7 @@ static int quad8_events_configure(struct counter_device *counter)
> static int quad8_watch_validate(struct counter_device *counter,
> const struct counter_watch *watch)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
>
> if (watch->channel > QUAD8_NUM_COUNTERS - 1)
> return -EINVAL;
> @@ -497,7 +497,7 @@ static int quad8_index_polarity_get(struct counter_device *counter,
> struct counter_signal *signal,
> u32 *index_polarity)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id - 16;
>
> *index_polarity = priv->index_polarity[channel_id];
> @@ -509,7 +509,7 @@ static int quad8_index_polarity_set(struct counter_device *counter,
> struct counter_signal *signal,
> u32 index_polarity)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id - 16;
> const int base_offset = priv->base + 2 * channel_id + 1;
> unsigned long irqflags;
> @@ -538,7 +538,7 @@ static int quad8_synchronous_mode_get(struct counter_device *counter,
> struct counter_signal *signal,
> u32 *synchronous_mode)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id - 16;
>
> *synchronous_mode = priv->synchronous_mode[channel_id];
> @@ -550,7 +550,7 @@ static int quad8_synchronous_mode_set(struct counter_device *counter,
> struct counter_signal *signal,
> u32 synchronous_mode)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id - 16;
> const int base_offset = priv->base + 2 * channel_id + 1;
> unsigned long irqflags;
> @@ -589,7 +589,7 @@ static int quad8_count_mode_read(struct counter_device *counter,
> struct counter_count *count,
> enum counter_count_mode *cnt_mode)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
>
> /* Map 104-QUAD-8 count mode to Generic Counter count mode */
> switch (priv->count_mode[count->id]) {
> @@ -614,7 +614,7 @@ static int quad8_count_mode_write(struct counter_device *counter,
> struct counter_count *count,
> enum counter_count_mode cnt_mode)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> unsigned int count_mode;
> unsigned int mode_cfg;
> const int base_offset = priv->base + 2 * count->id + 1;
> @@ -661,7 +661,7 @@ static int quad8_count_mode_write(struct counter_device *counter,
> static int quad8_count_enable_read(struct counter_device *counter,
> struct counter_count *count, u8 *enable)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
>
> *enable = priv->ab_enable[count->id];
>
> @@ -671,7 +671,7 @@ static int quad8_count_enable_read(struct counter_device *counter,
> static int quad8_count_enable_write(struct counter_device *counter,
> struct counter_count *count, u8 enable)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const int base_offset = priv->base + 2 * count->id;
> unsigned long irqflags;
> unsigned int ior_cfg;
> @@ -699,7 +699,7 @@ static const char *const quad8_noise_error_states[] = {
> static int quad8_error_noise_get(struct counter_device *counter,
> struct counter_count *count, u32 *noise_error)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
> const int base_offset = priv->base + 2 * count->id + 1;
>
> *noise_error = !!(inb(base_offset) & QUAD8_FLAG_E);
> @@ -710,7 +710,7 @@ static int quad8_error_noise_get(struct counter_device *counter,
> static int quad8_count_preset_read(struct counter_device *counter,
> struct counter_count *count, u64 *preset)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
>
> *preset = priv->preset[count->id];
>
> @@ -736,7 +736,7 @@ static void quad8_preset_register_set(struct quad8 *const priv, const int id,
> static int quad8_count_preset_write(struct counter_device *counter,
> struct counter_count *count, u64 preset)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> unsigned long irqflags;
>
> /* Only 24-bit values are supported */
> @@ -755,7 +755,7 @@ static int quad8_count_preset_write(struct counter_device *counter,
> static int quad8_count_ceiling_read(struct counter_device *counter,
> struct counter_count *count, u64 *ceiling)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> unsigned long irqflags;
>
> spin_lock_irqsave(&priv->lock, irqflags);
> @@ -780,7 +780,7 @@ static int quad8_count_ceiling_read(struct counter_device *counter,
> static int quad8_count_ceiling_write(struct counter_device *counter,
> struct counter_count *count, u64 ceiling)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> unsigned long irqflags;
>
> /* Only 24-bit values are supported */
> @@ -807,7 +807,7 @@ static int quad8_count_preset_enable_read(struct counter_device *counter,
> struct counter_count *count,
> u8 *preset_enable)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
>
> *preset_enable = !priv->preset_enable[count->id];
>
> @@ -818,7 +818,7 @@ static int quad8_count_preset_enable_write(struct counter_device *counter,
> struct counter_count *count,
> u8 preset_enable)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const int base_offset = priv->base + 2 * count->id + 1;
> unsigned long irqflags;
> unsigned int ior_cfg;
> @@ -845,7 +845,7 @@ static int quad8_signal_cable_fault_read(struct counter_device *counter,
> struct counter_signal *signal,
> u8 *cable_fault)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id / 2;
> unsigned long irqflags;
> bool disabled;
> @@ -875,7 +875,7 @@ static int quad8_signal_cable_fault_enable_read(struct counter_device *counter,
> struct counter_signal *signal,
> u8 *enable)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id / 2;
>
> *enable = !!(priv->cable_fault_enable & BIT(channel_id));
> @@ -887,7 +887,7 @@ static int quad8_signal_cable_fault_enable_write(struct counter_device *counter,
> struct counter_signal *signal,
> u8 enable)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id / 2;
> unsigned long irqflags;
> unsigned int cable_fault_enable;
> @@ -913,7 +913,7 @@ static int quad8_signal_fck_prescaler_read(struct counter_device *counter,
> struct counter_signal *signal,
> u8 *prescaler)
> {
> - const struct quad8 *const priv = counter->priv;
> + const struct quad8 *const priv = counter_priv(counter);
>
> *prescaler = priv->fck_prescaler[signal->id / 2];
>
> @@ -924,7 +924,7 @@ static int quad8_signal_fck_prescaler_write(struct counter_device *counter,
> struct counter_signal *signal,
> u8 prescaler)
> {
> - struct quad8 *const priv = counter->priv;
> + struct quad8 *const priv = counter_priv(counter);
> const size_t channel_id = signal->id / 2;
> const int base_offset = priv->base + 2 * channel_id;
> unsigned long irqflags;
> --
> 2.33.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-12-29 7:27 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 9:45 [PATCH v2 00/23] counter: cleanups and device lifetime fixes Uwe Kleine-König
2021-12-27 9:45 ` [PATCH v2 01/23] counter: Use container_of instead of drvdata to track counter_device Uwe Kleine-König
2021-12-28 17:14 ` Jonathan Cameron
2021-12-29 6:38 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 02/23] counter: ftm-quaddec: Drop unused platform_set_drvdata() Uwe Kleine-König
2021-12-28 17:37 ` Jonathan Cameron
2021-12-29 6:42 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 03/23] counter: microchip-tcb-capture: " Uwe Kleine-König
2021-12-28 17:38 ` Jonathan Cameron
2021-12-29 6:44 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 04/23] counter: Provide a wrapper to access device private data Uwe Kleine-König
2021-12-27 11:02 ` Greg Kroah-Hartman
2021-12-27 11:34 ` Lars-Peter Clausen
2021-12-27 11:52 ` Greg Kroah-Hartman
2021-12-27 12:28 ` Lars-Peter Clausen
2021-12-28 18:01 ` Jonathan Cameron
2021-12-29 6:47 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 05/23] counter: 104-quad-8: Convert to counter_priv() wrapper Uwe Kleine-König
2021-12-28 18:02 ` Jonathan Cameron
2021-12-29 11:11 ` Uwe Kleine-König
2021-12-29 7:27 ` William Breathitt Gray [this message]
2021-12-29 11:15 ` Uwe Kleine-König
2021-12-29 22:40 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 06/23] counter: interrupt-cnt: " Uwe Kleine-König
2021-12-28 18:04 ` Jonathan Cameron
2021-12-29 7:34 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 07/23] counter: microchip-tcb-capture: " Uwe Kleine-König
2021-12-28 18:05 ` Jonathan Cameron
2021-12-29 7:35 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 08/23] counter: intel-qep: " Uwe Kleine-König
2021-12-28 18:06 ` Jonathan Cameron
2021-12-29 7:35 ` William Breathitt Gray
2021-12-29 12:43 ` Jarkko Nikula
2021-12-27 9:45 ` [PATCH v2 09/23] counter: ftm-quaddec: " Uwe Kleine-König
2021-12-28 18:07 ` Jonathan Cameron
2021-12-29 7:36 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 10/23] counter: ti-eqep: " Uwe Kleine-König
2021-12-28 18:07 ` Jonathan Cameron
2021-12-29 7:45 ` William Breathitt Gray
2021-12-29 11:19 ` Uwe Kleine-König
2021-12-27 9:45 ` [PATCH v2 11/23] counter: stm32-lptimer-cnt: " Uwe Kleine-König
2021-12-28 18:08 ` Jonathan Cameron
2021-12-29 7:48 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 12/23] counter: stm32-timer-cnt: " Uwe Kleine-König
2021-12-28 18:08 ` Jonathan Cameron
2021-12-29 7:48 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 13/23] counter: Provide alternative counter registration functions Uwe Kleine-König
2021-12-27 12:16 ` Lars-Peter Clausen
2021-12-28 11:22 ` Uwe Kleine-König
2021-12-27 12:18 ` kernel test robot
2021-12-28 18:00 ` Jonathan Cameron
2021-12-29 11:27 ` Uwe Kleine-König
2021-12-29 12:07 ` Uwe Kleine-König
2021-12-29 13:49 ` Jarkko Nikula
2021-12-29 15:47 ` Uwe Kleine-König
2021-12-29 8:13 ` William Breathitt Gray
2022-01-06 10:53 ` Dan Carpenter
2021-12-27 9:45 ` [PATCH v2 14/23] counter: Update documentation for new " Uwe Kleine-König
2021-12-28 18:12 ` Jonathan Cameron
2021-12-29 8:19 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 15/23] counter: 104-quad-8: Convert to new counter registration Uwe Kleine-König
2021-12-27 12:19 ` Lars-Peter Clausen
2021-12-28 11:06 ` Uwe Kleine-König
2021-12-28 18:17 ` Jonathan Cameron
2021-12-29 8:24 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 16/23] counter: interrupt-cnt: " Uwe Kleine-König
2021-12-27 10:59 ` Greg Kroah-Hartman
2021-12-27 11:21 ` Lars-Peter Clausen
2021-12-27 11:34 ` Greg Kroah-Hartman
2021-12-27 11:44 ` Lars-Peter Clausen
2021-12-27 21:09 ` Uwe Kleine-König
2021-12-28 18:18 ` Jonathan Cameron
2021-12-29 8:27 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 17/23] counter: intel-qep: " Uwe Kleine-König
2021-12-27 15:02 ` Jarkko Nikula
2021-12-28 10:56 ` Uwe Kleine-König
2021-12-29 12:42 ` Jarkko Nikula
2021-12-28 18:20 ` Jonathan Cameron
2021-12-29 8:29 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 18/23] counter: ftm-quaddec: " Uwe Kleine-König
2021-12-28 18:23 ` Jonathan Cameron
2021-12-29 8:33 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 19/23] counter: microchip-tcb-capture: " Uwe Kleine-König
2021-12-28 18:24 ` Jonathan Cameron
2021-12-29 8:36 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 20/23] counter: stm32-timer-cnt: " Uwe Kleine-König
2021-12-28 18:25 ` Jonathan Cameron
2021-12-29 8:37 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 21/23] counter: stm32-lptimer-cnt: " Uwe Kleine-König
2021-12-28 18:26 ` Jonathan Cameron
2021-12-29 8:39 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 22/23] counter: ti-eqep: " Uwe Kleine-König
2021-12-28 18:29 ` Jonathan Cameron
2021-12-29 8:41 ` William Breathitt Gray
2021-12-27 9:45 ` [PATCH v2 23/23] counter: remove old and now unused registration API Uwe Kleine-König
2021-12-28 18:31 ` Jonathan Cameron
2021-12-29 8:43 ` William Breathitt Gray
2021-12-27 12:25 ` [PATCH v2 00/23] counter: cleanups and device lifetime fixes Lars-Peter Clausen
2021-12-28 17:35 ` Jonathan Cameron
2021-12-29 8:49 ` 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=YcwN5e7zjNLANT6d@shinobu \
--to=vilhelm.gray@gmail.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@pengutronix.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syednwaris@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox