Merge tag 'wireless-2022-01-21' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / counter / stm32-lptimer-cnt.c

diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c
index 5168833..68031d9 100644 (file)
--- a/drivers/counter/stm32-lptimer-cnt.c
+++ b/drivers/counter/stm32-lptimer-cnt.c
@@ -20,7 +20,6 @@
 #include <linux/types.h>
 
 struct stm32_lptim_cnt {
-       struct counter_device counter;
        struct device *dev;
        struct regmap *regmap;
        struct clk *clk;
@@ -141,7 +140,7 @@ static const enum counter_synapse_action stm32_lptim_cnt_synapse_actions[] = {
 static int stm32_lptim_cnt_read(struct counter_device *counter,
                                struct counter_count *count, u64 *val)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
        u32 cnt;
        int ret;
 
@@ -158,7 +157,7 @@ static int stm32_lptim_cnt_function_read(struct counter_device *counter,
                                         struct counter_count *count,
                                         enum counter_function *function)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
 
        if (!priv->quadrature_mode) {
                *function = COUNTER_FUNCTION_INCREASE;
@@ -177,7 +176,7 @@ static int stm32_lptim_cnt_function_write(struct counter_device *counter,
                                          struct counter_count *count,
                                          enum counter_function function)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
 
        if (stm32_lptim_is_enabled(priv))
                return -EBUSY;
@@ -200,7 +199,7 @@ static int stm32_lptim_cnt_enable_read(struct counter_device *counter,
                                       struct counter_count *count,
                                       u8 *enable)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
        int ret;
 
        ret = stm32_lptim_is_enabled(priv);
@@ -216,7 +215,7 @@ static int stm32_lptim_cnt_enable_write(struct counter_device *counter,
                                        struct counter_count *count,
                                        u8 enable)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
        int ret;
 
        /* Check nobody uses the timer, or already disabled/enabled */
@@ -241,7 +240,7 @@ static int stm32_lptim_cnt_ceiling_read(struct counter_device *counter,
                                        struct counter_count *count,
                                        u64 *ceiling)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
 
        *ceiling = priv->ceiling;
 
@@ -252,7 +251,7 @@ static int stm32_lptim_cnt_ceiling_write(struct counter_device *counter,
                                         struct counter_count *count,
                                         u64 ceiling)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
 
        if (stm32_lptim_is_enabled(priv))
                return -EBUSY;
@@ -277,7 +276,7 @@ static int stm32_lptim_cnt_action_read(struct counter_device *counter,
                                       struct counter_synapse *synapse,
                                       enum counter_synapse_action *action)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
        enum counter_function function;
        int err;
 
@@ -321,7 +320,7 @@ static int stm32_lptim_cnt_action_write(struct counter_device *counter,
                                        struct counter_synapse *synapse,
                                        enum counter_synapse_action action)
 {
-       struct stm32_lptim_cnt *const priv = counter->priv;
+       struct stm32_lptim_cnt *const priv = counter_priv(counter);
        enum counter_function function;
        int err;
 
@@ -411,14 +410,17 @@ static struct counter_count stm32_lptim_in1_counts = {
 static int stm32_lptim_cnt_probe(struct platform_device *pdev)
 {
        struct stm32_lptimer *ddata = dev_get_drvdata(pdev->dev.parent);
+       struct counter_device *counter;
        struct stm32_lptim_cnt *priv;
+       int ret;
 
        if (IS_ERR_OR_NULL(ddata))
                return -EINVAL;
 
-       priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv)
+       counter = devm_counter_alloc(&pdev->dev, sizeof(*priv));
+       if (!counter)
                return -ENOMEM;
+       priv = counter_priv(counter);
 
        priv->dev = &pdev->dev;
        priv->regmap = ddata->regmap;
@@ -426,23 +428,26 @@ static int stm32_lptim_cnt_probe(struct platform_device *pdev)
        priv->ceiling = STM32_LPTIM_MAX_ARR;
 
        /* Initialize Counter device */
-       priv->counter.name = dev_name(&pdev->dev);
-       priv->counter.parent = &pdev->dev;
-       priv->counter.ops = &stm32_lptim_cnt_ops;
+       counter->name = dev_name(&pdev->dev);
+       counter->parent = &pdev->dev;
+       counter->ops = &stm32_lptim_cnt_ops;
        if (ddata->has_encoder) {
-               priv->counter.counts = &stm32_lptim_enc_counts;
-               priv->counter.num_signals = ARRAY_SIZE(stm32_lptim_cnt_signals);
+               counter->counts = &stm32_lptim_enc_counts;
+               counter->num_signals = ARRAY_SIZE(stm32_lptim_cnt_signals);
        } else {
-               priv->counter.counts = &stm32_lptim_in1_counts;
-               priv->counter.num_signals = 1;
+               counter->counts = &stm32_lptim_in1_counts;
+               counter->num_signals = 1;
        }
-       priv->counter.num_counts = 1;
-       priv->counter.signals = stm32_lptim_cnt_signals;
-       priv->counter.priv = priv;
+       counter->num_counts = 1;
+       counter->signals = stm32_lptim_cnt_signals;
 
        platform_set_drvdata(pdev, priv);
 
-       return devm_counter_register(&pdev->dev, &priv->counter);
+       ret = devm_counter_add(&pdev->dev, counter);
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret, "Failed to add counter\n");
+
+       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP