counter: 104-quad-8: Convert to counter_priv() wrapper

This is a straight forward conversion to the new counter_priv() wrapper.

Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211230150300.72196-6-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c
index a97027db0446db3aee1e223634b3ab2171733fd5..41b4d6f4583c33d87a096604ccfba3cfbbe42ce2 100644 (file)
--- a/drivers/counter/104-quad-8.c
+++ b/drivers/counter/104-quad-8.c
@@ -112,7 +112,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 */
@@ -130,7 +130,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;
@@ -162,7 +162,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;
@@ -212,7 +212,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;
 
@@ -242,7 +242,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;
@@ -304,7 +304,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;
 
@@ -334,7 +334,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;
@@ -397,7 +397,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;
        struct counter_event_node *event_node;
@@ -495,7 +495,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];
@@ -507,7 +507,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;
@@ -536,7 +536,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];
@@ -548,7 +548,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;
@@ -587,7 +587,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]) {
@@ -612,7 +612,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;
@@ -659,7 +659,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];
 
@@ -669,7 +669,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;
@@ -697,7 +697,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);
@@ -708,7 +708,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];
 
@@ -734,7 +734,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 */
@@ -753,7 +753,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);
@@ -778,7 +778,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 */
@@ -805,7 +805,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];
 
@@ -816,7 +816,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;
@@ -843,7 +843,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;
@@ -873,7 +873,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));
@@ -885,7 +885,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;
@@ -911,7 +911,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];
 
@@ -922,7 +922,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;