From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3A22C433F5 for ; Wed, 29 Dec 2021 15:45:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240991AbhL2Ppu (ORCPT ); Wed, 29 Dec 2021 10:45:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240610AbhL2PpE (ORCPT ); Wed, 29 Dec 2021 10:45:04 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6420C06173E for ; Wed, 29 Dec 2021 07:45:03 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n2b8N-0006qb-4w; Wed, 29 Dec 2021 16:44:59 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n2b8H-007KHc-FP; Wed, 29 Dec 2021 16:44:52 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1n2b8G-00015Z-5y; Wed, 29 Dec 2021 16:44:52 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: William Breathitt Gray Cc: linux-iio@vger.kernel.org, kernel@pengutronix.de, Jonathan Cameron , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Fabrice Gasnier , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 20/23] counter: stm32-timer-cnt: Convert to new counter registration Date: Wed, 29 Dec 2021 16:44:38 +0100 Message-Id: <20211229154441.38045-21-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211229154441.38045-1-u.kleine-koenig@pengutronix.de> References: <20211229154441.38045-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=2408; h=from:subject; bh=yamPh52MWvtBuq1kwhHgzE8DC1LccrX53waJcMLV5Ao=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBhzIJX2YDALYtMQDBjFVY7z1y0vh4yin3H9exKf8He MpsunwCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYcyCVwAKCRDB/BR4rcrsCX2TB/ 4l6dwzOcg3gaNLauntF56BmjfxPhW8LKusPK96eCoKKVv1XVpK2d0OHMrSDwvCnfTE2sCns1muZr/A V8BkrwPtLWadBPofuKRCAZl5T2f9Jme3vQJy3E/SHrE5bg1u+8KcdBpbc/KfkAsc9MabSNiiW+kVPZ 3bnCQ8SA+Mf2kdBNIwos2dwUO1kolUsMp5vbZcWqhgl357yZQ6tTP3aiRCFw5lWYXkYUaGclBmnZEG Su6sxkO+OS4JysLsVNUdXtrUHIPHNgZrcIozmmk7dU7zAqAKHdzyrJf334yRTn50ynntq7xPIRiSiG z9qmwgaHSlUh1JPXodXOFngvE+DU0Z X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This fixes device lifetime issues where it was possible to free a live struct device. Fixes: ad29937e206f ("counter: Add STM32 Timer quadrature encoder") Reviewed-by: Jonathan Cameron Acked-by: William Breathitt Gray Signed-off-by: Uwe Kleine-König --- drivers/counter/stm32-timer-cnt.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c index 4b05b198a8d8..5779ae7c73cf 100644 --- a/drivers/counter/stm32-timer-cnt.c +++ b/drivers/counter/stm32-timer-cnt.c @@ -29,7 +29,6 @@ struct stm32_timer_regs { }; struct stm32_timer_cnt { - struct counter_device counter; struct regmap *regmap; struct clk *clk; u32 max_arr; @@ -317,31 +316,38 @@ static int stm32_timer_cnt_probe(struct platform_device *pdev) struct stm32_timers *ddata = dev_get_drvdata(pdev->dev.parent); struct device *dev = &pdev->dev; struct stm32_timer_cnt *priv; + struct counter_device *counter; + int ret; if (IS_ERR_OR_NULL(ddata)) return -EINVAL; - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) + counter = devm_counter_alloc(dev, sizeof(*priv)); + if (!counter) return -ENOMEM; + priv = counter_priv(counter); + priv->regmap = ddata->regmap; priv->clk = ddata->clk; priv->max_arr = ddata->max_arr; - priv->counter.name = dev_name(dev); - priv->counter.parent = dev; - priv->counter.ops = &stm32_timer_cnt_ops; - priv->counter.counts = &stm32_counts; - priv->counter.num_counts = 1; - priv->counter.signals = stm32_signals; - priv->counter.num_signals = ARRAY_SIZE(stm32_signals); - priv->counter.priv = priv; + counter->name = dev_name(dev); + counter->parent = dev; + counter->ops = &stm32_timer_cnt_ops; + counter->counts = &stm32_counts; + counter->num_counts = 1; + counter->signals = stm32_signals; + counter->num_signals = ARRAY_SIZE(stm32_signals); platform_set_drvdata(pdev, priv); /* Register Counter device */ - return devm_counter_register(dev, &priv->counter); + ret = devm_counter_add(dev, counter); + if (ret < 0) + dev_err_probe(dev, ret, "Failed to add counter\n"); + + return ret; } static int __maybe_unused stm32_timer_cnt_suspend(struct device *dev) -- 2.34.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E2382C433FE for ; Wed, 29 Dec 2021 15:46:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9gDOufSOxsOY7zpOA/Rfzdpkwiez5u0jEwYfzF4YW9Y=; b=x5D+8hfNq4ES0z zHxE+5bMWO/HpZ0Ky0HvVtoNUj9ErW1R7DILK6dJq8q2ZeI04JeJ/6Ei6iN/4VI/wOo8JVE1r1WgU 8YJtw4f6bP7JAztXaB278i65LU2M2C2yvJc7KVAr5bZgqGjiZCgwrjE5O9A/qWx9BNUjyVkThSAdz Fc8zDHGGVBqhfjSZmtZ98UPugO+HJwwWJWbywJT+Ajq+F6tshbSZ/+g2qlv70lQ/pRrYzBx7AbWdQ xsPuL77STKES1HdqWVavDsMx0rNlAc4mY36eSBAkdXWivkvwWq5qmWlxLYnkdyppkYDqqWYI2x4lY nnk0dSHwp2rrHJOrAERw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n2b8c-0032nq-3S; Wed, 29 Dec 2021 15:45:14 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n2b8Y-0032kU-RF for linux-arm-kernel@lists.infradead.org; Wed, 29 Dec 2021 15:45:12 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n2b8N-0006qb-4w; Wed, 29 Dec 2021 16:44:59 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n2b8H-007KHc-FP; Wed, 29 Dec 2021 16:44:52 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1n2b8G-00015Z-5y; Wed, 29 Dec 2021 16:44:52 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: William Breathitt Gray Cc: linux-iio@vger.kernel.org, kernel@pengutronix.de, Jonathan Cameron , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Fabrice Gasnier , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 20/23] counter: stm32-timer-cnt: Convert to new counter registration Date: Wed, 29 Dec 2021 16:44:38 +0100 Message-Id: <20211229154441.38045-21-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211229154441.38045-1-u.kleine-koenig@pengutronix.de> References: <20211229154441.38045-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2408; h=from:subject; bh=yamPh52MWvtBuq1kwhHgzE8DC1LccrX53waJcMLV5Ao=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBhzIJX2YDALYtMQDBjFVY7z1y0vh4yin3H9exKf8He MpsunwCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYcyCVwAKCRDB/BR4rcrsCX2TB/ 4l6dwzOcg3gaNLauntF56BmjfxPhW8LKusPK96eCoKKVv1XVpK2d0OHMrSDwvCnfTE2sCns1muZr/A V8BkrwPtLWadBPofuKRCAZl5T2f9Jme3vQJy3E/SHrE5bg1u+8KcdBpbc/KfkAsc9MabSNiiW+kVPZ 3bnCQ8SA+Mf2kdBNIwos2dwUO1kolUsMp5vbZcWqhgl357yZQ6tTP3aiRCFw5lWYXkYUaGclBmnZEG Su6sxkO+OS4JysLsVNUdXtrUHIPHNgZrcIozmmk7dU7zAqAKHdzyrJf334yRTn50ynntq7xPIRiSiG z9qmwgaHSlUh1JPXodXOFngvE+DU0Z X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211229_074510_906685_ED8FBEB8 X-CRM114-Status: GOOD ( 16.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhpcyBmaXhlcyBkZXZpY2UgbGlmZXRpbWUgaXNzdWVzIHdoZXJlIGl0IHdhcyBwb3NzaWJsZSB0 byBmcmVlIGEgbGl2ZQpzdHJ1Y3QgZGV2aWNlLgoKRml4ZXM6IGFkMjk5MzdlMjA2ZiAoImNvdW50 ZXI6IEFkZCBTVE0zMiBUaW1lciBxdWFkcmF0dXJlIGVuY29kZXIiKQpSZXZpZXdlZC1ieTogSm9u YXRoYW4gQ2FtZXJvbiA8Sm9uYXRoYW4uQ2FtZXJvbkBodWF3ZWkuY29tPgpBY2tlZC1ieTogV2ls bGlhbSBCcmVhdGhpdHQgR3JheSA8dmlsaGVsbS5ncmF5QGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1i eTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4KLS0t CiBkcml2ZXJzL2NvdW50ZXIvc3RtMzItdGltZXItY250LmMgfCAzMCArKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAxMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2NvdW50ZXIvc3RtMzItdGltZXItY250LmMg Yi9kcml2ZXJzL2NvdW50ZXIvc3RtMzItdGltZXItY250LmMKaW5kZXggNGIwNWIxOThhOGQ4Li41 Nzc5YWU3YzczY2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvY291bnRlci9zdG0zMi10aW1lci1jbnQu YworKysgYi9kcml2ZXJzL2NvdW50ZXIvc3RtMzItdGltZXItY250LmMKQEAgLTI5LDcgKzI5LDYg QEAgc3RydWN0IHN0bTMyX3RpbWVyX3JlZ3MgewogfTsKIAogc3RydWN0IHN0bTMyX3RpbWVyX2Nu dCB7Ci0Jc3RydWN0IGNvdW50ZXJfZGV2aWNlIGNvdW50ZXI7CiAJc3RydWN0IHJlZ21hcCAqcmVn bWFwOwogCXN0cnVjdCBjbGsgKmNsazsKIAl1MzIgbWF4X2FycjsKQEAgLTMxNywzMSArMzE2LDM4 IEBAIHN0YXRpYyBpbnQgc3RtMzJfdGltZXJfY250X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZp Y2UgKnBkZXYpCiAJc3RydWN0IHN0bTMyX3RpbWVycyAqZGRhdGEgPSBkZXZfZ2V0X2RydmRhdGEo cGRldi0+ZGV2LnBhcmVudCk7CiAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBkZXYtPmRldjsKIAlz dHJ1Y3Qgc3RtMzJfdGltZXJfY250ICpwcml2OworCXN0cnVjdCBjb3VudGVyX2RldmljZSAqY291 bnRlcjsKKwlpbnQgcmV0OwogCiAJaWYgKElTX0VSUl9PUl9OVUxMKGRkYXRhKSkKIAkJcmV0dXJu IC1FSU5WQUw7CiAKLQlwcml2ID0gZGV2bV9remFsbG9jKGRldiwgc2l6ZW9mKCpwcml2KSwgR0ZQ X0tFUk5FTCk7Ci0JaWYgKCFwcml2KQorCWNvdW50ZXIgPSBkZXZtX2NvdW50ZXJfYWxsb2MoZGV2 LCBzaXplb2YoKnByaXYpKTsKKwlpZiAoIWNvdW50ZXIpCiAJCXJldHVybiAtRU5PTUVNOwogCisJ cHJpdiA9IGNvdW50ZXJfcHJpdihjb3VudGVyKTsKKwogCXByaXYtPnJlZ21hcCA9IGRkYXRhLT5y ZWdtYXA7CiAJcHJpdi0+Y2xrID0gZGRhdGEtPmNsazsKIAlwcml2LT5tYXhfYXJyID0gZGRhdGEt Pm1heF9hcnI7CiAKLQlwcml2LT5jb3VudGVyLm5hbWUgPSBkZXZfbmFtZShkZXYpOwotCXByaXYt PmNvdW50ZXIucGFyZW50ID0gZGV2OwotCXByaXYtPmNvdW50ZXIub3BzID0gJnN0bTMyX3RpbWVy X2NudF9vcHM7Ci0JcHJpdi0+Y291bnRlci5jb3VudHMgPSAmc3RtMzJfY291bnRzOwotCXByaXYt PmNvdW50ZXIubnVtX2NvdW50cyA9IDE7Ci0JcHJpdi0+Y291bnRlci5zaWduYWxzID0gc3RtMzJf c2lnbmFsczsKLQlwcml2LT5jb3VudGVyLm51bV9zaWduYWxzID0gQVJSQVlfU0laRShzdG0zMl9z aWduYWxzKTsKLQlwcml2LT5jb3VudGVyLnByaXYgPSBwcml2OworCWNvdW50ZXItPm5hbWUgPSBk ZXZfbmFtZShkZXYpOworCWNvdW50ZXItPnBhcmVudCA9IGRldjsKKwljb3VudGVyLT5vcHMgPSAm c3RtMzJfdGltZXJfY250X29wczsKKwljb3VudGVyLT5jb3VudHMgPSAmc3RtMzJfY291bnRzOwor CWNvdW50ZXItPm51bV9jb3VudHMgPSAxOworCWNvdW50ZXItPnNpZ25hbHMgPSBzdG0zMl9zaWdu YWxzOworCWNvdW50ZXItPm51bV9zaWduYWxzID0gQVJSQVlfU0laRShzdG0zMl9zaWduYWxzKTsK IAogCXBsYXRmb3JtX3NldF9kcnZkYXRhKHBkZXYsIHByaXYpOwogCiAJLyogUmVnaXN0ZXIgQ291 bnRlciBkZXZpY2UgKi8KLQlyZXR1cm4gZGV2bV9jb3VudGVyX3JlZ2lzdGVyKGRldiwgJnByaXYt PmNvdW50ZXIpOworCXJldCA9IGRldm1fY291bnRlcl9hZGQoZGV2LCBjb3VudGVyKTsKKwlpZiAo cmV0IDwgMCkKKwkJZGV2X2Vycl9wcm9iZShkZXYsIHJldCwgIkZhaWxlZCB0byBhZGQgY291bnRl clxuIik7CisKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgaW50IF9fbWF5YmVfdW51c2VkIHN0 bTMyX3RpbWVyX2NudF9zdXNwZW5kKHN0cnVjdCBkZXZpY2UgKmRldikKLS0gCjIuMzQuMQoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1r ZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpo dHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJu ZWwK