From patchwork Wed Feb 14 09:31:03 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: 13556142 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 BBB47C48BC4 for ; Wed, 14 Feb 2024 09:35:33 +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=GLF6OTzXo23ABGNyf1y1uK95LxlcaIlPnqiSyOH9SLI=; b=3dnqdH9gvRRthP lLBVuIfEN5m00VYAF4ZNrVFOG2e5eb9TE8QBQxy7Rr24bD0LfufJhw5LPc7yyaYEBaYSvhQi5TWS7 QJgXEePfHoHtIzKZ31uyQu7GO+EFt/iLoUNOJz5+se0SkzjWMor18wiRoc3IkotZWF6tgTr9LfbFq d+ixAFmuzPV4fLYdy0JhpN2aSGtIs5xTp58hrGvCWndFC6PrPeCSV892Qc1dpKJ/5EX5ObKGhaLJ3 8DTWMh2eNzKEJbky4oGXIDqHPvepjqO4EKOTg1vc3w0AoouUsm0d2ogqVLu51RypUrvE3WbaYyynX kTUIAIxzpxxV2HBJmlfA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raBfh-0000000CL0M-3SNh; Wed, 14 Feb 2024 09:35:17 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1raBev-0000000CKAK-1AqC for linux-arm-kernel@lists.infradead.org; Wed, 14 Feb 2024 09:34:31 +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 1raBen-0004UC-4A; Wed, 14 Feb 2024 10:34:21 +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 1raBem-000f8V-AY; Wed, 14 Feb 2024 10:34:20 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1raBem-004Y0h-0n; Wed, 14 Feb 2024 10:34:20 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Florian Fainelli , Ray Jui , Scott Branden , linux-pwm@vger.kernel.org Cc: Broadcom internal kernel review list , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v6 016/164] pwm: bcm2835: Make use of devm_pwmchip_alloc() function Date: Wed, 14 Feb 2024 10:31:03 +0100 Message-ID: <441489772bdfbb2cd206fd534b36c63e8c50843a.1707900770.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=2140; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=UJ7kZSxcKk3H/k/fOQ/8AhXATk/5yZZHRmPO2TCmzGo=; b=owGbwMvMwMXY3/A7olbonx/jabUkhtQzHbE63mqvXs9kTrscyyYYzbPQsDwszW37fXdLgWbrs 3IL5+Z0MhqzMDByMciKKbLYN67JtKqSi+xc++8yzCBWJpApDFycAjCRDG/2/67ZjluTHjPpee9O m8rlGHCOd4JshFT6avcfot5igtWmne8qAi8esVW8IHVsMsOCIvlPf5s0HQ+weF5MM34XnGA1J0E ux9rSUuPNlnmSStMiLkdlXH3NesnUSG36NK9Fp7+efVg3fRXzpend2/Z36v4yeu4T7D53gjovU9 yZV4nb/x5O856qGaDoU/1oQnpk4tWQNLcty4QO+9b+tCyfyGffUs+2eG1qj4U2Q9eCH68Xhz3f5 JvNe7e0+GqA5Q9laQneDe+LI7KfBzlkN/bu3h65NNtl9a2via8Ofs4Q0+va/uba5ENn+tTajF9n /GqNWn7/KjNbTNMVCz7Lc5mn5W5XCB5K8A/ii/12dXofAA== 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-20240214_013429_413589_2870306C X-CRM114-Status: GOOD ( 14.95 ) 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-bcm2835 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-bcm2835.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index 711c174bbe23..aa35acbb0cbc 100644 --- a/drivers/pwm/pwm-bcm2835.c +++ b/drivers/pwm/pwm-bcm2835.c @@ -24,7 +24,6 @@ #define PERIOD_MIN 0x2 struct bcm2835_pwm { - struct pwm_chip chip; void __iomem *base; struct clk *clk; unsigned long rate; @@ -32,7 +31,7 @@ struct bcm2835_pwm { static inline struct bcm2835_pwm *to_bcm2835_pwm(struct pwm_chip *chip) { - return container_of(chip, struct bcm2835_pwm, chip); + return pwmchip_get_drvdata(chip); } static int bcm2835_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) @@ -134,12 +133,14 @@ static void devm_clk_rate_exclusive_put(void *data) static int bcm2835_pwm_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct bcm2835_pwm *pc; int ret; - pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); - if (!pc) - return -ENOMEM; + chip = devm_pwmchip_alloc(&pdev->dev, 2, sizeof(*pc)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + pc = to_bcm2835_pwm(chip); pc->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(pc->base)) @@ -165,14 +166,12 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, -EINVAL, "failed to get clock rate\n"); - pc->chip.dev = &pdev->dev; - pc->chip.ops = &bcm2835_pwm_ops; - pc->chip.atomic = true; - pc->chip.npwm = 2; + chip->ops = &bcm2835_pwm_ops; + chip->atomic = true; platform_set_drvdata(pdev, pc); - ret = devm_pwmchip_add(&pdev->dev, &pc->chip); + ret = devm_pwmchip_add(&pdev->dev, chip); if (ret < 0) return dev_err_probe(&pdev->dev, ret, "failed to add pwmchip\n");