From patchwork Thu Jan 25 12:10:04 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: 13530910 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 8BE69C48260 for ; Thu, 25 Jan 2024 14:12:58 +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=/oeNpF6KQZMJfegxdhyRlw4CNCMt+IvYFlTtnPS5m7k=; b=d9aG3XUBHsu4cr tJgnHmR38KqPUSQeBDPU+LDTA54idujS/uLAjd+LTdGheziO3VXA8zq0cs6kPc0UNhkERzNVRC9NK wU4foThrGcHAJnnWsGJos8RcQtz/9tQKnFi/XVM9EBsv9nSpH2+2KJG5jaQEyYqHTw9kXm/rNHxlD eFm0a29oVyD5w7cQ90MMoGu/BxGp9m8dTlu5splTMFFAE/bQNg2oejT+ytijXtxAfsYSUxdCKJNY8 d2llyjuiN6LFPuSf23PEUr6hmzLTAnquW8obhAI60U0xZ1nuVleQGb7MVddncHGNt/Rk5N/fGMKc4 IBLa5ZhUgo5B1uOyaXVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0TB-00000000I5k-2NTp; Thu, 25 Jan 2024 14:12:41 +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 1rT0Rx-00000000HG7-0Se8 for linux-arm-kernel@bombadil.infradead.org; Thu, 25 Jan 2024 14:11:25 +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=zodK5nDWeaC8c/0m6fpR1k61WEJd5c7jxCurV5IezwQ=; b=B8NRLh1s+rZ1qWXWLlBGX6xDtm 7THHiDdMlyZeVVlzfPRNliDFG3003KEjEAuRsXXjZ2HKG1eHwKYTrPPBSNWDfK3yHdlDzDDM4kvsZ Dg8WHwTtUaXwJJU0LUNC/RsDFHQJGv4CR1bFHhZNoyCcLhGgLKMHMndQ1xX7Xm73jHsj2J63DEen2 S9VgPR8gtPvOpxkbgB7JIb76S8lqvsmAt0U7fSXzTaPvXGxAZMFyiEDa5ByMCFOMs4EkJHh8D9wkH H/1lBmsGMmMaDGxyOOZP7fQ88oYYUMwNUHI7t4CPnIGOBVhmBSgiNvH7GiVr25vyhalwRRM7SRJw0 WBP6WOHw==; 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 1rSybc-00000005Hfz-3FV3 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 1rSyZR-0004d8-AP; Thu, 25 Jan 2024 13:11:01 +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 1rSyZP-002HVI-J9; Thu, 25 Jan 2024 13:10:59 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rSyZP-007n4z-1e; Thu, 25 Jan 2024 13:10:59 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Sean Anderson , Michal Simek , linux-pwm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v5 102/111] pwm: xilinx: Make use of devm_pwmchip_alloc() function Date: Thu, 25 Jan 2024 13:10:04 +0100 Message-ID: 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=3206; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=as3S2egeJ/QZdTUEgNrgJSJQI7Am97f8zTw8M8Bg5WY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlsk+xN9oc1YRMXX3AynlpRvrvMmCCIXir8Cjx4 BnW/FFqx6iJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZbJPsQAKCRCPgPtYfRL+ Tm45CACp+YZ/zWPGZv9AUc/cZ4no3uHmpyJ4kAp6Zi9zW6qArfTFNW1Sj/AGlm4B6YKoRLWGyeh hsGTt/WK4CNSocALAyeYUvv4gPAcqEV3KA3iK+ZX/0DCuN++M0Q8Zufemw4c/FcJga6bbGnbotG PaA5p2ueL2Nvsq5PaTsNXbnwLrDPMcIj7malzTwAt5+jN/5KtOLpqXouIOX9k9Yrgn11lTTNUzL U5h+mpQh9dLjC/gibD/ZdaSHGzdin/xMrGd1cBgQ1komaGTSvJQgqg5fsS3+YDgTfjtMXgHPOIM vb2MBAVoSjMJwLVz7B4A4bBHk2ReuLouc28oK8Fu/v16IXq6 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_121316_899447_BC7EBEEC X-CRM114-Status: GOOD ( 15.69 ) 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-xilinx 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-xilinx.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/drivers/pwm/pwm-xilinx.c b/drivers/pwm/pwm-xilinx.c index 5f3c2a6fed11..465ac9617256 100644 --- a/drivers/pwm/pwm-xilinx.c +++ b/drivers/pwm/pwm-xilinx.c @@ -80,15 +80,10 @@ unsigned int xilinx_timer_get_period(struct xilinx_timer_priv *priv, #define TCSR_PWM_CLEAR (TCSR_MDT | TCSR_LOAD) #define TCSR_PWM_MASK (TCSR_PWM_SET | TCSR_PWM_CLEAR) -struct xilinx_pwm_device { - struct pwm_chip chip; - struct xilinx_timer_priv priv; -}; - static inline struct xilinx_timer_priv *xilinx_pwm_chip_to_priv(struct pwm_chip *chip) { - return &container_of(chip, struct xilinx_pwm_device, chip)->priv; + return pwmchip_get_drvdata(chip); } static bool xilinx_timer_pwm_enabled(u32 tcsr0, u32 tcsr1) @@ -213,8 +208,8 @@ static int xilinx_pwm_probe(struct platform_device *pdev) int ret; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; + struct pwm_chip *chip; struct xilinx_timer_priv *priv; - struct xilinx_pwm_device *xilinx_pwm; u32 pwm_cells, one_timer, width; void __iomem *regs; @@ -225,11 +220,11 @@ static int xilinx_pwm_probe(struct platform_device *pdev) if (ret) return dev_err_probe(dev, ret, "could not read #pwm-cells\n"); - xilinx_pwm = devm_kzalloc(dev, sizeof(*xilinx_pwm), GFP_KERNEL); - if (!xilinx_pwm) - return -ENOMEM; - platform_set_drvdata(pdev, xilinx_pwm); - priv = &xilinx_pwm->priv; + chip = devm_pwmchip_alloc(dev, 1, sizeof(*priv)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + priv = xilinx_pwm_chip_to_priv(chip); + platform_set_drvdata(pdev, chip); regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(regs)) @@ -278,10 +273,8 @@ static int xilinx_pwm_probe(struct platform_device *pdev) return dev_err_probe(dev, ret, "Clock enable failed\n"); clk_rate_exclusive_get(priv->clk); - xilinx_pwm->chip.dev = dev; - xilinx_pwm->chip.ops = &xilinx_pwm_ops; - xilinx_pwm->chip.npwm = 1; - ret = pwmchip_add(&xilinx_pwm->chip); + chip->ops = &xilinx_pwm_ops; + ret = pwmchip_add(chip); if (ret) { clk_rate_exclusive_put(priv->clk); clk_disable_unprepare(priv->clk); @@ -293,11 +286,12 @@ static int xilinx_pwm_probe(struct platform_device *pdev) static void xilinx_pwm_remove(struct platform_device *pdev) { - struct xilinx_pwm_device *xilinx_pwm = platform_get_drvdata(pdev); + struct pwm_chip *chip = platform_get_drvdata(pdev); + struct xilinx_timer_priv *priv = xilinx_pwm_chip_to_priv(chip); - pwmchip_remove(&xilinx_pwm->chip); - clk_rate_exclusive_put(xilinx_pwm->priv.clk); - clk_disable_unprepare(xilinx_pwm->priv.clk); + pwmchip_remove(chip); + clk_rate_exclusive_put(priv->clk); + clk_disable_unprepare(priv->clk); } static const struct of_device_id xilinx_pwm_of_match[] = {