From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Jonathan Cameron <Jonathan.Cameron@huawei.com>, Kamel Bouhara <kamel.bouhara@bootlin.com>, linux-arm-kernel@lists.infradead.org, William Breathitt Gray <vilhelm.gray@gmail.com> Subject: [PATCH v4 19/23] counter: microchip-tcb-capture: Convert to new counter registration Date: Thu, 30 Dec 2021 16:02:56 +0100 [thread overview] Message-ID: <20211230150300.72196-20-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20211230150300.72196-1-u.kleine-koenig@pengutronix.de> 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> --- drivers/counter/microchip-tcb-capture.c | 30 ++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c index 1b56b7444668..00844445143b 100644 --- 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[] = { -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Jonathan Cameron <Jonathan.Cameron@huawei.com>, Kamel Bouhara <kamel.bouhara@bootlin.com>, linux-arm-kernel@lists.infradead.org, William Breathitt Gray <vilhelm.gray@gmail.com> Subject: [PATCH v4 19/23] counter: microchip-tcb-capture: Convert to new counter registration Date: Thu, 30 Dec 2021 16:02:56 +0100 [thread overview] Message-ID: <20211230150300.72196-20-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20211230150300.72196-1-u.kleine-koenig@pengutronix.de> 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> --- drivers/counter/microchip-tcb-capture.c | 30 ++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c index 1b56b7444668..00844445143b 100644 --- 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[] = { -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-12-30 15:03 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-30 15:02 [PATCH v4 00/23] counter: cleanups and device lifetime fixes Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 01/23] counter: Use container_of instead of drvdata to track counter_device Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 02/23] counter: ftm-quaddec: Drop unused platform_set_drvdata() Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 03/23] counter: microchip-tcb-capture: " Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 04/23] counter: Provide a wrapper to access device private data Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 05/23] counter: 104-quad-8: Convert to counter_priv() wrapper Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 06/23] counter: interrupt-cnt: " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 07/23] counter: microchip-tcb-capture: " Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 08/23] counter: intel-qep: " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 09/23] counter: ftm-quaddec: " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 10/23] counter: ti-eqep: " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 11/23] counter: stm32-lptimer-cnt: " Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 12/23] counter: stm32-timer-cnt: " Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 13/23] counter: Provide alternative counter registration functions Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 14/23] counter: Update documentation for new " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 15/23] counter: 104-quad-8: Convert to new counter registration Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 16/23] counter: interrupt-cnt: " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 17/23] counter: intel-qep: " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 18/23] counter: ftm-quaddec: " Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König [this message] 2021-12-30 15:02 ` [PATCH v4 19/23] counter: microchip-tcb-capture: " Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 20/23] counter: stm32-timer-cnt: " Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 21/23] counter: stm32-lptimer-cnt: " Uwe Kleine-König 2021-12-30 15:02 ` Uwe Kleine-König 2021-12-30 15:02 ` [PATCH v4 22/23] counter: ti-eqep: " Uwe Kleine-König 2021-12-30 15:03 ` [PATCH v4 23/23] counter: remove old and now unused registration API Uwe Kleine-König 2021-12-30 16:44 ` [PATCH v4 00/23] counter: cleanups and device lifetime fixes Greg Kroah-Hartman 2021-12-30 16:44 ` Greg Kroah-Hartman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211230150300.72196-20-u.kleine-koenig@pengutronix.de \ --to=u.kleine-koenig@pengutronix.de \ --cc=Jonathan.Cameron@huawei.com \ --cc=gregkh@linuxfoundation.org \ --cc=kamel.bouhara@bootlin.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=vilhelm.gray@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.