From patchwork Thu Jan 25 12:09: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: 13530885 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 BC91BC47258 for ; Thu, 25 Jan 2024 14:08:52 +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=cYWIo8zQdkKM5NvWr2Df4dchEHG4mQjCj4ykh1sEBQg=; b=Bu5DuHFczY5dVW rLLpJ3qagYho5qtKrz5ufHaQNZjlS4QOYe1iNtp0mgOpea/DU184GdU+9hyF96ZBa53Jogll0VF0w KEsixm4q86OH8vmhR/T/1M0fzoUuQ9s+zB51Lxp6i+ypUVst6TYt/TQ2MVBfKdjp+U35h4afGgLkd dgBiM5WnnfJAm8J5pzAZjGXJ5KY9BxZxSOOGQ+/98+b73/NgVeOc4t+k8CSCZP3uQqHJF5s0Hz0Uu DNqmmmCzsN/VSTy56dvhmJv/YfOC63rqGTSbGLmviXNotTpAZnybTnQN8TmvGEBveq5ulfuh4NgjR H/LATRQ6nNsk2/7JgNFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0PK-00000000FGP-1VI1; Thu, 25 Jan 2024 14:08:42 +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 1rT0Oc-00000000Evs-0NUg for linux-arm-kernel@bombadil.infradead.org; Thu, 25 Jan 2024 14:07:58 +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=8Um1r0x/YD0JJ4xTOvDzrcYDspd9p9lm5UFna3sW+0U=; b=jZT/F6AqWBe/ZPhbof8ThCdkCT ZvmMi4dDVBfPvYdK7CxInQ+dmT/j53kXxkTIN6YsBc9jas3W+Qk17f4Uwx/ofqvXCSM9W0ObrbjmB apGJ36s6clMpmMLv/lygPB5yHeSfJn9b3T3TzzmKtiO8cOqlefrkasS3T62JRwrV4lreivBk0ljMp WQ/56oqZQQ0A1957zgPsF0Z72NPCiUPo7HqKDJtzQsvHP/PYtMeWcBAip+fTGzKjbVfREpwq//xOO 2kRY8PUJU5r+eoKxNVnklyTlby++DQRE1YTWi9ndtCX/W6vIShz45jOfEBvt66oyeOCPGA1nUluBs uOMpmUPQ==; 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 1rSyba-00000009sDa-1UDc for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 12:13:21 +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 1rSyZF-0004B7-SP; Thu, 25 Jan 2024 13:10:49 +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 1rSyZE-002HRP-Dv; Thu, 25 Jan 2024 13:10:48 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rSyZE-007n0x-17; Thu, 25 Jan 2024 13:10:48 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Hector Martin , Sven Peter , linux-pwm@vger.kernel.org Cc: Alyssa Rosenzweig , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v5 042/111] pwm: apple: Make use of devm_pwmchip_alloc() function Date: Thu, 25 Jan 2024 13:09:04 +0100 Message-ID: <2e206fd150681b9723ab19e3cccee6888a3b46de.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=2027; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=H2gBKJqPhxEH02LxqBcE7cgJijeXYph95OqB+mGaqEU=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlsk9rlpZFHURacBlhG0kY5bULxwpd5zYoQh1k7 lR9eSFMJHaJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZbJPawAKCRCPgPtYfRL+ Ti5SB/9YqXuqNC3bQ8hqIp2f5nMBxU8URTKYa2VuwlklztiyBxaGLZkKep9xeaYBMJ/AuKpWY5e 4F/vGHWma3E2FxesQJn65+H9I+o2bu4w/KiwJLmwgCi/eAcPyfYc7UAwskM6FRmwUXuwZdiXLHU FJ6jlxBm+a/+rzEJdFeuUZEhKNmxHoIQGu3Tgh3+JvRg6AxVGE+Iy++WuuhC47meesmW11BLbU0 e0teupMjotHCBgM5u6sWu6Uk/3dyTxSQjvbiaq7Xn1996TMvKAj1kP7p0xyzFxO1xd8xBaHx1LS fbqHrHjx5fcVZOq9If0XCtolQo9ixqeNCLK7VtiaPPVR10N9 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_121315_756857_8E99F6C7 X-CRM114-Status: GOOD ( 12.94 ) 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-apple 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-apple.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/pwm/pwm-apple.c b/drivers/pwm/pwm-apple.c index 4d755b628d9e..6e58aca2f13c 100644 --- a/drivers/pwm/pwm-apple.c +++ b/drivers/pwm/pwm-apple.c @@ -32,14 +32,13 @@ #define APPLE_PWM_CTRL_OUTPUT_ENABLE BIT(14) struct apple_pwm { - struct pwm_chip chip; void __iomem *base; u64 clkrate; }; static inline struct apple_pwm *to_apple_pwm(struct pwm_chip *chip) { - return container_of(chip, struct apple_pwm, chip); + return pwmchip_get_drvdata(chip); } static int apple_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, @@ -103,13 +102,16 @@ static const struct pwm_ops apple_pwm_ops = { static int apple_pwm_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct apple_pwm *fpwm; struct clk *clk; int ret; - fpwm = devm_kzalloc(&pdev->dev, sizeof(*fpwm), GFP_KERNEL); - if (!fpwm) - return -ENOMEM; + chip = devm_pwmchip_alloc(&pdev->dev, 1, sizeof(*fpwm)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + + fpwm = to_apple_pwm(chip); fpwm->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(fpwm->base)) @@ -129,11 +131,9 @@ static int apple_pwm_probe(struct platform_device *pdev) if (fpwm->clkrate > NSEC_PER_SEC) return dev_err_probe(&pdev->dev, -EINVAL, "pwm clock out of range"); - fpwm->chip.dev = &pdev->dev; - fpwm->chip.npwm = 1; - fpwm->chip.ops = &apple_pwm_ops; + chip->ops = &apple_pwm_ops; - ret = devm_pwmchip_add(&pdev->dev, &fpwm->chip); + ret = devm_pwmchip_add(&pdev->dev, chip); if (ret < 0) return dev_err_probe(&pdev->dev, ret, "unable to add pwm chip");