From patchwork Thu Jan 25 12:09:31 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: 13530919 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 3D560C48260 for ; Thu, 25 Jan 2024 14:15:23 +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=h2D5xXc+aVOUA6zzPv0R+ZPd003wroKejnhpTWkWsgg=; b=GummMkPYWcMw4q Slm4nXeGoNLHj56b+qBG67AxKBOpBXNFurBm8UsqlyE37fMDYtRgTBLlgVoFDe8tbhT+PTG3IBpet wikwcr15zvM0bcc0yM1h96Y7LUyRHd6HbY52oPXMhNcnBr2XlMkzAQEtiUxwxvbbXk9NwVf+JmnNe CC4qBwNatckMnoKvzyI7zoenaaHil2VHL0zMtbKMmLID14iti1B0wziaI3L2SXjpTtUrzlocHjlKl c3ctyIw0bEWJjL/5rOyiBq+WQKJ8bmUreSVaqW1K17X+EpuwI0joLIKPam7e1VNXutkn1ANY8n2oT VeaIFFr45Np8xk6wuBVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0VZ-00000000JN6-21To; Thu, 25 Jan 2024 14:15:09 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0VB-00000000JA9-0EGc for linux-arm-kernel@bombadil.infradead.org; Thu, 25 Jan 2024 14:14:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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=17CDjAnX5r8ST76/Kw5rqbzXYpTkU5ry9glUaTGvn4w=; b=Vsxx6bj+YAHNFFg9mP5anNVIaY TcM5tcGnfgGmirZfe0IFKrgTohkpJ/hE6hgYVdQkAjV3BppEpIgqI9Y3M6ysrCTyAGc+diUmFiHNs GjfXveiF3oxp1dq6VA1hNPg6wD72t27Wn7FONeAW5paK2PJyevj7CLQzV4AXguk8Q4boZZ6DE+m2w Qs915LiY4Gqpgf6Yj7FGvfVnV2lreC3bVO95o5qStYqpBTJZMQ/OUfP+9HSYUsHm/QMY4IfB1SGfp pVvVN1UCSsC2SXceSAncNix1cU44FQPR56YwJyZO51yIg04svIC4jtKZdwdfJeSx3lwHeGTNEIjJ7 WwK9RThQ==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rSybT-00000005Hjd-05vF for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 12:13:09 +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 1rSyZK-0004Q1-Uk; Thu, 25 Jan 2024 13:10:54 +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 1rSyZJ-002HTB-LM; Thu, 25 Jan 2024 13:10:53 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rSyZJ-007n2m-1q; Thu, 25 Jan 2024 13:10:53 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Vladimir Zapolskiy , linux-pwm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v5 069/111] pwm: lpc32xx: Make use of devm_pwmchip_alloc() function Date: Thu, 25 Jan 2024 13:09:31 +0100 Message-ID: <5e32d14f20bbd1ea78b20d4f24af6d63d7d0df2f.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=2413; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=zaexTqZbDea+1T5ODHlpi8H+vbuSfxVuSfiw4opuuIA=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlsk+LwrmSRQ128wGA/R6iDpLRU0hjwr68+Jo1v q7UGfKc6D2JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZbJPiwAKCRCPgPtYfRL+ ThMXB/9nfyjsn113qb4NLTNMVOFCBu8l2P5LsRxvx2/cT2PtgxN3+tAO0Wznqjb1Lcnrq03yBiW 79SAcU/AWi3KkPET003aVC0TiGK409QWGcQGFK1aR2D9eb3RXHA0XW59d7Ixd9ic7AaTH09QvFC 2szmmYDi6F/R3Jo4+g8bflLHFDCvjTV6zR9G5Qw4QzxKpKGJXEuZ5YdTMZ5iZkAnseZlnbWhHkC cv+MGCCU4YU320HbiI5pHLd52MhVK67JV/xHVetmMEC3dQ7VXzdXL0EYGpiPTU3GAmxsw6g0X5h wZ2La7L9Jb5iiypcHHg3P56Zz+9LvGHBVhp0jwFOGKVHUdIX 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_121307_220453_8CA8FEB9 X-CRM114-Status: GOOD ( 17.22 ) 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-lpc32xx 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-lpc32xx.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-lpc32xx.c b/drivers/pwm/pwm-lpc32xx.c index 1d9f3e7a2434..c748537e57d1 100644 --- a/drivers/pwm/pwm-lpc32xx.c +++ b/drivers/pwm/pwm-lpc32xx.c @@ -15,7 +15,6 @@ #include struct lpc32xx_pwm_chip { - struct pwm_chip chip; struct clk *clk; void __iomem *base; }; @@ -23,8 +22,10 @@ struct lpc32xx_pwm_chip { #define PWM_ENABLE BIT(31) #define PWM_PIN_LEVEL BIT(30) -#define to_lpc32xx_pwm_chip(_chip) \ - container_of(_chip, struct lpc32xx_pwm_chip, chip) +static inline struct lpc32xx_pwm_chip *to_lpc32xx_pwm_chip(struct pwm_chip *chip) +{ + return pwmchip_get_drvdata(chip); +} static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, int duty_ns, int period_ns) @@ -119,13 +120,15 @@ static const struct pwm_ops lpc32xx_pwm_ops = { static int lpc32xx_pwm_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct lpc32xx_pwm_chip *lpc32xx; int ret; u32 val; - lpc32xx = devm_kzalloc(&pdev->dev, sizeof(*lpc32xx), GFP_KERNEL); - if (!lpc32xx) - return -ENOMEM; + chip = devm_pwmchip_alloc(&pdev->dev, 1, sizeof(*lpc32xx)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + lpc32xx = to_lpc32xx_pwm_chip(chip); lpc32xx->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(lpc32xx->base)) @@ -135,16 +138,14 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev) if (IS_ERR(lpc32xx->clk)) return PTR_ERR(lpc32xx->clk); - lpc32xx->chip.dev = &pdev->dev; - lpc32xx->chip.ops = &lpc32xx_pwm_ops; - lpc32xx->chip.npwm = 1; + chip->ops = &lpc32xx_pwm_ops; /* If PWM is disabled, configure the output to the default value */ val = readl(lpc32xx->base); val &= ~PWM_PIN_LEVEL; writel(val, lpc32xx->base); - ret = devm_pwmchip_add(&pdev->dev, &lpc32xx->chip); + ret = devm_pwmchip_add(&pdev->dev, chip); if (ret < 0) { dev_err(&pdev->dev, "failed to add PWM chip, error %d\n", ret); return ret;