From patchwork Thu Jan 25 12:09:12 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: 13530896 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 AC8ADC48285 for ; Thu, 25 Jan 2024 14:09:31 +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=Zz/gkfgS8RPmUe/9pHWxOwp8cPOL9WhDzwZjwu14t30=; b=Xp9fBNO5U1dePG 75Hobaf7HCuIk4uIMgogbWaJtwkq4nHxC76Uwk6zzB3o0n8BmjE/MSknu76cqXe/h9KjmIFPLJY68 aSVEWhvlFen4yNf2WyNv/oAvr8cJErCBeiaemrVKUW7i7QRX+NC5ohOAlDf+IQ25zgYEvL9pJWby4 iEHElXWbPQpl8fs8N+26I/RvuKvvA+xmlvYwUvaXq3/6v5OiP943tJQfx0xLTlsa6M/heJNHChlk5 33dnEI5ftQ2HearXJBnAwSQb4RfEQ4RV9cLq63dA8PpKJPq5v++aKbUSSnFM94MEJ9ceZt1XT6xYE g1/CDbcO9zggkDEHOZDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0Ps-00000000Flq-09Av; Thu, 25 Jan 2024 14:09:16 +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 1rT0P4-00000000FA2-0S13 for linux-arm-kernel@bombadil.infradead.org; Thu, 25 Jan 2024 14:08:26 +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=tGubfqazQglh6ZGRToG4VYEthfYG/V+3kw7KUXGTlXM=; b=GyH3LnNjopvyr7+aZgZ73n5Ag1 cw1Oxni/BdmehRl0RT4Hldv2Z+C/GpkXpp7L0nWqBylJ5eJjuRMZN9SHRSDV/yJIFXrxln7ALRUWY F79PRJSkjEqAQP6P5WL7kEIhmciognys/HVyLQbtoyEewVWiQmU+w1iDl9xfWVR1RB5vz0e2mbUpJ IxUuNucwdQbIVJFdRxAOfYnnylB64SrfDNlfPUZ01ZbZSBVoUmACVduC/UHTl4gAtt2aHSAaMFmWQ DzSW7LC8rFFmFlTO0GVVsXObiTiFZJAJaRbVpa0DlTOGoyOR+jSfUpA2HxQmRMFNKSbrzHGYclTVt Dq6DuBkw==; 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 1rSybY-00000009sDd-1WPO for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 12:13:18 +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 1rSyZG-0004Hd-Le; Thu, 25 Jan 2024 13:10:50 +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 1rSyZG-002HRw-0e; Thu, 25 Jan 2024 13:10:50 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rSyZF-007n1T-32; Thu, 25 Jan 2024 13:10:49 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Florian Fainelli , linux-pwm@vger.kernel.org Cc: Broadcom internal kernel review list , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v5 050/111] pwm: brcmstb: Make use of devm_pwmchip_alloc() function Date: Thu, 25 Jan 2024 13:09:12 +0100 Message-ID: <4da39b2333ae7639d724e925eaffb51d9e577492.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=2069; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=TZC2i850mmZA7TRa+F19cdXeyXFOZTXIsdwaUd0XKe0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlsk90yXfDgUf/cID0mjpPVYObWmZe7DptZfvar G34xi4Bu2uJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZbJPdAAKCRCPgPtYfRL+ TvxXB/99FlBF4ZIb3AlkJeqniog7qM3n62rsSuFgiDwQ7M+LXfyWsZSDlWvbYVjz8k/WRgaHgBH pthnHVuHV4GsT8cZeFEN0XEQ3zQaAY1R4ZGqHyMwYqyD/0Hh62+JPz/tlzVc2f97s85keOrAiQC aS9tPeiSOabtnuekfF4Vb8FON+5M0JOC0eCKUY06PwkUZZFC6IhH+/H2ldwsYMP6xFz3KwBZomQ ZFU+zJFh0y+O/7lSGBnKOV1RnxtlGcgrn2mL8tPZOJeZwabIXfH4z5B8NUwCDnbjYKH2IqYnUhR ZsR5rqgLQ63y9beDlTtBPRBNAEpistIE+jlbay6eLrDUb5Sn 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_121313_819026_B4B0E667 X-CRM114-Status: GOOD ( 12.66 ) 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-brcmstb 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-brcmstb.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/pwm/pwm-brcmstb.c b/drivers/pwm/pwm-brcmstb.c index 0fdeb0b2dbf3..82d27d07ba91 100644 --- a/drivers/pwm/pwm-brcmstb.c +++ b/drivers/pwm/pwm-brcmstb.c @@ -54,7 +54,6 @@ struct brcmstb_pwm { void __iomem *base; struct clk *clk; - struct pwm_chip chip; }; static inline u32 brcmstb_pwm_readl(struct brcmstb_pwm *p, @@ -77,7 +76,7 @@ static inline void brcmstb_pwm_writel(struct brcmstb_pwm *p, u32 value, static inline struct brcmstb_pwm *to_brcmstb_pwm(struct pwm_chip *chip) { - return container_of(chip, struct brcmstb_pwm, chip); + return pwmchip_get_drvdata(chip); } /* @@ -230,12 +229,14 @@ MODULE_DEVICE_TABLE(of, brcmstb_pwm_of_match); static int brcmstb_pwm_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct brcmstb_pwm *p; int ret; - p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL); - if (!p) - return -ENOMEM; + chip = devm_pwmchip_alloc(&pdev->dev, 2, sizeof(*p)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + p = to_brcmstb_pwm(chip); p->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(p->clk)) @@ -244,15 +245,13 @@ static int brcmstb_pwm_probe(struct platform_device *pdev) platform_set_drvdata(pdev, p); - p->chip.dev = &pdev->dev; - p->chip.ops = &brcmstb_pwm_ops; - p->chip.npwm = 2; + chip->ops = &brcmstb_pwm_ops; p->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(p->base)) return PTR_ERR(p->base); - ret = devm_pwmchip_add(&pdev->dev, &p->chip); + ret = devm_pwmchip_add(&pdev->dev, chip); if (ret) return dev_err_probe(&pdev->dev, ret, "failed to add PWM chip\n");