From patchwork Thu Jan 25 12:09:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13530871 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 17F1CC48286 for ; Thu, 25 Jan 2024 14:07: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=0koAf7bWzSnMecBVOtuxaA016PL/lIdSOwrPgvV9+ac=; b=UBDBulntguD8mF uRslvV3sftecV0sJFb9Ls2NzTG6WUS/vxSBdAEBWXXmKLnvAtHBG9EFEGVVIRQph27H/1IYhI4b19 ZyQh6QzG7GSvS68qLkQRdjDIFAtNCDesO0o4xSW5Pd577lxwNUS4joLzpQtQKJDPEuYFMdQsBPw37 bfyYXzEtnsRdBCkc1DuW8B/4nS5H6eMqC946DiHY5hcVe9zf0DUaZ0sKb7iBhKHHc5gwOoxMlFwJH 1PkIjSK1VnM9dR1EFz3uouKdtts5D0fDyrfDlH8cXMY60qW9n84eLz72BFktZQoj/iU3J0iw2LHyC LtYwDR34WRQ06p6XK4qw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0O9-00000000EXb-34XH; Thu, 25 Jan 2024 14:07:29 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0O8-00000000EVS-0hR8 for linux-arm-kernel@bombadil.infradead.org; Thu, 25 Jan 2024 14:07:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description; bh=bk79hDXmtBBIJjvsDAjQ6a/pV9DeaE9Q7de8dkBV9Xw=; b=Q91htVVxupGsyXWPd29+uGyesS McexkWPh+rh0NXPiBy7koFw7LJjMBixEFcU/dy0z3b9KemdfIKDzRknj74vmufn4ba30SBhz/L/a7 SekikxkwsPL5mdJEet4q0TV7UBS50GKVwjRBIE8QXrI1WhinewSDDoHrZmN0JidyblX7j+saA8J3E /1OvakMN2AD3/46NSbV2b1KyRKwNm0e7Li0qv7Xnn0IU8IOctyAZ9YIr2JDQFWpa08xicGitCRGeP 0Q8qUliTQGMVzFMqWMrgOC/bR6PgNpyRVKmgV/NbkejU0O0N3PTev6LvFkae+vH0SeuJivjxFP8t3 Re4ChUwg==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rSybZ-00000009sDR-1dQr for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 12:13:20 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rSyZP-0004Yz-7P; Thu, 25 Jan 2024 13:10: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 1rSyZN-002HUf-UG; Thu, 25 Jan 2024 13:10:57 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rSyZN-007n4O-2l; Thu, 25 Jan 2024 13:10:57 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Maxime Coquelin , Alexandre Torgue , linux-pwm@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v5 093/111] pwm: stmpe: Make use of devm_pwmchip_alloc() function Date: Thu, 25 Jan 2024 13:09:55 +0100 Message-ID: <0c1f5268c8045c2b4cb6e00bd2d81a20d0df53c9.1706182805.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2455; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=vidtE9CgEuAi+9yLI9nc75r2oHZCcD5MypZmUOpuSi0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlsk+n+E9fw0hJYqoDvom0/6h63yfF5ktdkZ3gq BUOhlhqrpGJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZbJPpwAKCRCPgPtYfRL+ TiGNB/9vGzi2NfwWEhEY8IsXVwdtspOXHyJ9JsxWnZWBaSRVmeveEwNu/pAElgGNlz96XlhCTFK PZQkr8+IvGngLHmJIxPT9+oQedpXPKKRE/iiUwq2zmhsfQsAqkOA0BCZgf+NIQjEajZFrIeqpbA 3RdXG0IwKieoDKAJ/s859qy/fJk30M4yqIs/33TzHway4PPGpFkM6feTDCD9xrZiHsrZImKmvdK DFPQhlGemU67ANopPFqYtR0iquQ4/XhwZpajZBt1SyAizEpw2rxriikpBdDamPoSdpf8eKOz7vm 1itx7NWHoCux6w8FmvfGbPLfxb1tejG8p6VJZUCtFmHZzO5q 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.whiteo.stw.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-20240125_121314_821482_536A3BE2 X-CRM114-Status: GOOD ( 14.10 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This prepares the pwm-stmpe driver to further changes of the pwm core outlined in the commit introducing devm_pwmchip_alloc(). There is no intended semantical change and the driver should behave as before. Signed-off-by: Uwe Kleine-König --- drivers/pwm/pwm-stmpe.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/drivers/pwm/pwm-stmpe.c b/drivers/pwm/pwm-stmpe.c index 05f3f38031ee..319c6ad6a79b 100644 --- a/drivers/pwm/pwm-stmpe.c +++ b/drivers/pwm/pwm-stmpe.c @@ -27,13 +27,12 @@ struct stmpe_pwm { struct stmpe *stmpe; - struct pwm_chip chip; u8 last_duty; }; static inline struct stmpe_pwm *to_stmpe_pwm(struct pwm_chip *chip) { - return container_of(chip, struct stmpe_pwm, chip); + return pwmchip_get_drvdata(chip); } static int stmpe_24xx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) @@ -292,33 +291,36 @@ static const struct pwm_ops stmpe_24xx_pwm_ops = { static int __init stmpe_pwm_probe(struct platform_device *pdev) { struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent); + struct pwm_chip *chip; struct stmpe_pwm *stmpe_pwm; int ret; - stmpe_pwm = devm_kzalloc(&pdev->dev, sizeof(*stmpe_pwm), GFP_KERNEL); - if (!stmpe_pwm) - return -ENOMEM; + switch (stmpe->partnum) { + case STMPE2401: + case STMPE2403: + break; + case STMPE1601: + return dev_err_probe(&pdev->dev, -EINVAL, + "STMPE1601 not yet supported\n"); + default: + return dev_err_probe(&pdev->dev, -EINVAL, + "Unknown STMPE PWM\n"); + } + + chip = devm_pwmchip_alloc(&pdev->dev, 3, sizeof(*stmpe_pwm)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + stmpe_pwm = to_stmpe_pwm(chip); stmpe_pwm->stmpe = stmpe; - stmpe_pwm->chip.dev = &pdev->dev; - if (stmpe->partnum == STMPE2401 || stmpe->partnum == STMPE2403) { - stmpe_pwm->chip.ops = &stmpe_24xx_pwm_ops; - stmpe_pwm->chip.npwm = 3; - } else { - if (stmpe->partnum == STMPE1601) - dev_err(&pdev->dev, "STMPE1601 not yet supported\n"); - else - dev_err(&pdev->dev, "Unknown STMPE PWM\n"); - - return -ENODEV; - } + chip->ops = &stmpe_24xx_pwm_ops; ret = stmpe_enable(stmpe, STMPE_BLOCK_PWM); if (ret) return ret; - ret = pwmchip_add(&stmpe_pwm->chip); + ret = pwmchip_add(chip); if (ret) { stmpe_disable(stmpe, STMPE_BLOCK_PWM); return ret;