OSDN Git Service

counter: intel-qep: Convert to counter_priv() wrapper
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Thu, 30 Dec 2021 15:02:45 +0000 (16:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Dec 2021 16:44:06 +0000 (17:44 +0100)
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>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211230150300.72196-9-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/counter/intel-qep.c

index 0924d16..8f84a48 100644 (file)
@@ -109,7 +109,7 @@ static void intel_qep_init(struct intel_qep *qep)
 static int intel_qep_count_read(struct counter_device *counter,
                                struct counter_count *count, u64 *val)
 {
-       struct intel_qep *const qep = counter->priv;
+       struct intel_qep *const qep = counter_priv(counter);
 
        pm_runtime_get_sync(qep->dev);
        *val = intel_qep_readl(qep, INTEL_QEPCOUNT);
@@ -176,7 +176,7 @@ static struct counter_synapse intel_qep_count_synapses[] = {
 static int intel_qep_ceiling_read(struct counter_device *counter,
                                  struct counter_count *count, u64 *ceiling)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
 
        pm_runtime_get_sync(qep->dev);
        *ceiling = intel_qep_readl(qep, INTEL_QEPMAX);
@@ -188,7 +188,7 @@ static int intel_qep_ceiling_read(struct counter_device *counter,
 static int intel_qep_ceiling_write(struct counter_device *counter,
                                   struct counter_count *count, u64 max)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
        int ret = 0;
 
        /* Intel QEP ceiling configuration only supports 32-bit values */
@@ -213,7 +213,7 @@ out:
 static int intel_qep_enable_read(struct counter_device *counter,
                                 struct counter_count *count, u8 *enable)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
 
        *enable = qep->enabled;
 
@@ -223,7 +223,7 @@ static int intel_qep_enable_read(struct counter_device *counter,
 static int intel_qep_enable_write(struct counter_device *counter,
                                  struct counter_count *count, u8 val)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
        u32 reg;
        bool changed;
 
@@ -256,7 +256,7 @@ static int intel_qep_spike_filter_ns_read(struct counter_device *counter,
                                          struct counter_count *count,
                                          u64 *length)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
        u32 reg;
 
        pm_runtime_get_sync(qep->dev);
@@ -277,7 +277,7 @@ static int intel_qep_spike_filter_ns_write(struct counter_device *counter,
                                           struct counter_count *count,
                                           u64 length)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
        u32 reg;
        bool enable;
        int ret = 0;
@@ -326,7 +326,7 @@ static int intel_qep_preset_enable_read(struct counter_device *counter,
                                        struct counter_count *count,
                                        u8 *preset_enable)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
        u32 reg;
 
        pm_runtime_get_sync(qep->dev);
@@ -341,7 +341,7 @@ static int intel_qep_preset_enable_read(struct counter_device *counter,
 static int intel_qep_preset_enable_write(struct counter_device *counter,
                                         struct counter_count *count, u8 val)
 {
-       struct intel_qep *qep = counter->priv;
+       struct intel_qep *qep = counter_priv(counter);
        u32 reg;
        int ret = 0;