counter: microchip-tcb-capture: Convert to new counter registration

This fixes device lifetime issues where it was possible to free a live
struct device.

Fixes: 106b104137fd ("counter: Add microchip TCB capture counter")
Reviewed-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-20-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c
index 1b56b74..0084444 100644 (file)
--- a/drivers/counter/microchip-tcb-capture.c
+++ b/drivers/counter/microchip-tcb-capture.c
@@ -24,7 +24,6 @@
 
 struct mchp_tc_data {
        const struct atmel_tcb_config *tc_cfg;
-       struct counter_device counter;
        struct regmap *regmap;
        int qdec_mode;
        int num_channels;
@@ -296,6 +295,7 @@ static int mchp_tc_probe(struct platform_device *pdev)
        struct device_node *np = pdev->dev.of_node;
        const struct atmel_tcb_config *tcb_config;
        const struct of_device_id *match;
+       struct counter_device *counter;
        struct mchp_tc_data *priv;
        char clk_name[7];
        struct regmap *regmap;
@@ -303,9 +303,10 @@ static int mchp_tc_probe(struct platform_device *pdev)
        int channel;
        int ret, i;
 
-       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);
 
        match = of_match_node(atmel_tc_of_match, np->parent);
        tcb_config = match->data;
@@ -360,16 +361,19 @@ static int mchp_tc_probe(struct platform_device *pdev)
 
        priv->tc_cfg = tcb_config;
        priv->regmap = regmap;
-       priv->counter.name = dev_name(&pdev->dev);
-       priv->counter.parent = &pdev->dev;
-       priv->counter.ops = &mchp_tc_ops;
-       priv->counter.num_counts = ARRAY_SIZE(mchp_tc_counts);
-       priv->counter.counts = mchp_tc_counts;
-       priv->counter.num_signals = ARRAY_SIZE(mchp_tc_count_signals);
-       priv->counter.signals = mchp_tc_count_signals;
-       priv->counter.priv = priv;
-
-       return devm_counter_register(&pdev->dev, &priv->counter);
+       counter->name = dev_name(&pdev->dev);
+       counter->parent = &pdev->dev;
+       counter->ops = &mchp_tc_ops;
+       counter->num_counts = ARRAY_SIZE(mchp_tc_counts);
+       counter->counts = mchp_tc_counts;
+       counter->num_signals = ARRAY_SIZE(mchp_tc_count_signals);
+       counter->signals = mchp_tc_count_signals;
+
+       ret = devm_counter_add(&pdev->dev, counter);
+       if (ret < 0)
+               return dev_err_probe(&pdev->dev, ret, "Failed to add counter\n");
+
+       return 0;
 }
 
 static const struct of_device_id mchp_tc_dt_ids[] = {