From patchwork Thu Jan 25 12:09:09 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: 13530895 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 B1687C48260 for ; Thu, 25 Jan 2024 14:09:29 +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=4j0AFoOV0UItHbjxA5k6h15tD4TySW+SPO+4aOFdTNU=; b=BFGIFN9/sOlTRw U7cusSSmP6HSr7xFyINfAd+XcVADo19X30L3fGAPXUuwv/o0SJPRLzJ8Jk1rbn25q25Ja5/YuFvNV Cbegty67DDwk0NfGJtH9m+VpUboHpAoG6stNnRXYn8xKzRvLvnEKJ0IsG995l7pDJmfeAgylgDIKU nwtr1zBdafZISIKFjOGHImoaW3XRgJO1IbTtgF+3wEthALrzmsVSI9jWgld4709O6dUd3dI8X9+Cv Hi3cfUyyLVsv+P2lLywXOt2WOld4qVGbFDx8s1XbFIPDtLyOHSlldnTT3efScuOYb/qB7zHr8lWyF fgvO5Npwddm62AN+anCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0Pn-00000000FiY-4Bfo; Thu, 25 Jan 2024 14:09:12 +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 1rT0P3-00000000FA2-2iLE for linux-arm-kernel@bombadil.infradead.org; Thu, 25 Jan 2024 14:08:25 +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=GEG2qfft0Mh8KW0ip9+4ogP1mH9tBH0gduBKyOhjsuw=; b=YoLzA3dS1QPfmLQzWx48azS+Nw dgc4AcEBtIG9BGgSgCpNkm3v8xM+L1k7/NFpqdGYcL6Oz48lp7Ntg8C87U5PMYbKv7O96FM4vKd8z APbYqJui/V/qhdEftEhXXfIzyZpKKNwpRptjAQiOFMV2k5ewGPl7nA3WrqskkXGoW09mK69A8uWOt x1ZFS/7rov3YVhAB88Z9rj2LU6W6NJ7Y3tKBUjim9Q3PvdV/SdkJ5HQQr1cRRXa/JLkHjqsSa09rI Sacd9cWwRPEDFJwUlEyL0FV4y+BWppZkvxO9PDP+3EgHVjlJ2/Prvp4siu6fxA9FgY4ZHrnYah1t3 AkK/8Mgw==; 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-00000009sDb-1o4W for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 12:13:19 +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-0004Eo-8r; 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 1rSyZF-002HRh-BI; Thu, 25 Jan 2024 13:10:49 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rSyZF-007n1H-0s; Thu, 25 Jan 2024 13:10:49 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Ray Jui , Scott Branden , linux-pwm@vger.kernel.org Cc: Broadcom internal kernel review list , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v5 047/111] pwm: bcm-iproc: Make use of devm_pwmchip_alloc() function Date: Thu, 25 Jan 2024 13:09:09 +0100 Message-ID: <1b1e749557294b383d15d06f8f2da847a3e7d87f.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=2342; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=KnJ19DF+WYdolraq2C+RV1Rwrj5TWFY7glRMFg+qlK4=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlsk9xJDxLxKjbhXCFVsudQML2+70Kv6ydMl25V 2ReDB7mKnuJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZbJPcQAKCRCPgPtYfRL+ TgNLCACE9hoI0AR+p7q6vVZ0ZVRqIleC87WOR3rF1SpgbBR3BIuwxApeftKVD19PZd80ePzW6iv LZNKWc55OCjJkyZEF9/Yl8z6SbahfLaPYSi9cL9ADUs/FFFheGW0oYJC2byAmfojS2L5Tbbvbbg oDbsJITjPRB6eYeNTYkf3HAKfIyL3asrez/sRYkLup4HBuR3Vnb6pA0a94wvl35TppdVr0QgQMY 0/yS1zTkNAT9fcsRR4ZU1AZHZkk7w3y24k2KCbi08t3S/xUZNGt8Awy7+rEq+enro2r+0R3f/Xm O7qWCAYAXrkTaq1Dpf/r0vl9KV8u1EVjeXCjoS7GgVHZY7c/ 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_901124_934793FD X-CRM114-Status: GOOD ( 13.99 ) 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-bcm-iproc 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-bcm-iproc.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-bcm-iproc.c b/drivers/pwm/pwm-bcm-iproc.c index 758254025683..f4c9f10e490e 100644 --- a/drivers/pwm/pwm-bcm-iproc.c +++ b/drivers/pwm/pwm-bcm-iproc.c @@ -34,14 +34,13 @@ #define IPROC_PWM_PRESCALE_MAX 0x3f struct iproc_pwmc { - struct pwm_chip chip; void __iomem *base; struct clk *clk; }; static inline struct iproc_pwmc *to_iproc_pwmc(struct pwm_chip *chip) { - return container_of(chip, struct iproc_pwmc, chip); + return pwmchip_get_drvdata(chip); } static void iproc_pwmc_enable(struct iproc_pwmc *ip, unsigned int channel) @@ -187,20 +186,20 @@ static const struct pwm_ops iproc_pwm_ops = { static int iproc_pwmc_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct iproc_pwmc *ip; unsigned int i; u32 value; int ret; - ip = devm_kzalloc(&pdev->dev, sizeof(*ip), GFP_KERNEL); - if (!ip) - return -ENOMEM; + chip = devm_pwmchip_alloc(&pdev->dev, 4, sizeof(*ip)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + ip = to_iproc_pwmc(chip); platform_set_drvdata(pdev, ip); - ip->chip.dev = &pdev->dev; - ip->chip.ops = &iproc_pwm_ops; - ip->chip.npwm = 4; + chip->ops = &iproc_pwm_ops; ip->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(ip->base)) @@ -214,14 +213,14 @@ static int iproc_pwmc_probe(struct platform_device *pdev) /* Set full drive and normal polarity for all channels */ value = readl(ip->base + IPROC_PWM_CTRL_OFFSET); - for (i = 0; i < ip->chip.npwm; i++) { + for (i = 0; i < chip->npwm; i++) { value &= ~(1 << IPROC_PWM_CTRL_TYPE_SHIFT(i)); value |= 1 << IPROC_PWM_CTRL_POLARITY_SHIFT(i); } writel(value, ip->base + IPROC_PWM_CTRL_OFFSET); - ret = devm_pwmchip_add(&pdev->dev, &ip->chip); + ret = devm_pwmchip_add(&pdev->dev, chip); if (ret < 0) return dev_err_probe(&pdev->dev, ret, "failed to add PWM chip\n");