OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: 106b104137 ("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>
This commit is contained in:
Uwe Kleine-König 2021-12-30 16:02:56 +01:00 committed by Greg Kroah-Hartman
parent b5d6547c8e
commit 5998ea6214
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/counter/microchip-tcb-capture.c
View File

@ -24,7 +24,6 @@
struct mchp_tc_data { struct mchp_tc_data {
const struct atmel_tcb_config *tc_cfg; const struct atmel_tcb_config *tc_cfg;
struct counter_device counter;
struct regmap *regmap; struct regmap *regmap;
int qdec_mode; int qdec_mode;
int num_channels; int num_channels;
@ -296,6 +295,7 @@ static int mchp_tc_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
const struct atmel_tcb_config *tcb_config; const struct atmel_tcb_config *tcb_config;
const struct of_device_id *match; const struct of_device_id *match;
struct counter_device *counter;
struct mchp_tc_data *priv; struct mchp_tc_data *priv;
char clk_name[7]; char clk_name[7];
struct regmap *regmap; struct regmap *regmap;
@ -303,9 +303,10 @@ static int mchp_tc_probe(struct platform_device *pdev)
int channel; int channel;
int ret, i; int ret, i;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); counter = devm_counter_alloc(&pdev->dev, sizeof(*priv));
if (!priv) if (!counter)
return -ENOMEM; return -ENOMEM;
priv = counter_priv(counter);
match = of_match_node(atmel_tc_of_match, np->parent); match = of_match_node(atmel_tc_of_match, np->parent);
tcb_config = match->data; tcb_config = match->data;
@ -360,16 +361,19 @@ static int mchp_tc_probe(struct platform_device *pdev)
priv->tc_cfg = tcb_config; priv->tc_cfg = tcb_config;
priv->regmap = regmap; priv->regmap = regmap;
priv->counter.name = dev_name(&pdev->dev); counter->name = dev_name(&pdev->dev);
priv->counter.parent = &pdev->dev; counter->parent = &pdev->dev;
priv->counter.ops = &mchp_tc_ops; counter->ops = &mchp_tc_ops;
priv->counter.num_counts = ARRAY_SIZE(mchp_tc_counts); counter->num_counts = ARRAY_SIZE(mchp_tc_counts);
priv->counter.counts = mchp_tc_counts; counter->counts = mchp_tc_counts;
priv->counter.num_signals = ARRAY_SIZE(mchp_tc_count_signals); counter->num_signals = ARRAY_SIZE(mchp_tc_count_signals);
priv->counter.signals = mchp_tc_count_signals; counter->signals = mchp_tc_count_signals;
priv->counter.priv = 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;
} }
static const struct of_device_id mchp_tc_dt_ids[] = { static const struct of_device_id mchp_tc_dt_ids[] = {