From patchwork Wed Feb 14 09:32:18 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: 13556161 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 3AA1CC48BEC for ; Wed, 14 Feb 2024 09:36:49 +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=OUGx1KYcbJCjcanaD4FJaKdOCPYBLMzFRrShMJD5H6Y=; b=qClfbUhj3ApIad 1y6ZEmg6648BU2Y/ox9tuwD2vz0spVWOH6bJBLvPlXwUGSCYR43kDXf8ifcJEq0VkCqPNlQDpQkW6 hJaDKrcpCaou2mPuhPy0k5wAbkyFRC3mZAz8KktHbjgBpJwI/dLjA1IOBkPOti7UCa+gbP0p2/r1Q sCnVcqsKkZxhUYVNH6DCuECX1LYFnsbYTmxcmLX1hvt3ucb7K6PWHjR6Rdt+B9cLkYQT+J4M5JfoV CpcaOise14el9AhqxgE6725QoGKyZPfBrRfSi0tXqV7sdxvCNbvEFV3f/AOfQRSBw+bcQZg6fLFya 5PIOAhp6p3S0GtYHWBhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raBgt-0000000CM1y-2Wbn; Wed, 14 Feb 2024 09:36:31 +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 1raBf4-0000000CKLx-1lJE for linux-arm-kernel@lists.infradead.org; Wed, 14 Feb 2024 09:34:42 +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 1raBf0-0005NI-8x; Wed, 14 Feb 2024 10:34:34 +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 1raBex-000fEM-SF; Wed, 14 Feb 2024 10:34:31 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1raBex-004Y5q-2Y; Wed, 14 Feb 2024 10:34:31 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Heiko Stuebner , linux-pwm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v6 091/164] pwm: rochchip: Prepare removing pwm_chip from driver data Date: Wed, 14 Feb 2024 10:32:18 +0100 Message-ID: <301657442c578cc8d330ad2b07463d59fed4bff6.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=2308; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=IKTf684HbAbCFxV/P3BN2Q+Ew9cnAV7p+JKFfoj1v3k=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlzIizoVhC0FRyoze4sZvNk4frGiCMCNVmrvi9M JGTTXoVeSKJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcyIswAKCRCPgPtYfRL+ To66B/9bBWqw86Vi8ALhIjsb6DA2j/fZlrFMRghd87lmbzOpKe6/tZdipPrZgwiwVXriuSOudXZ /CwapgIrtBTNdkqOnRN3qAzSLbHBEpSplM/x5v9X8OtEO0M1rS/Lo64rWB4t2lZsDxAKGBD2h9o UfJhjI/XHr7X8Mj5SVrx0bAkzMgPJXRnHzAId1ZdkPDnSewMV3i01WzEwhRiIu4pk7s4NiqRPGL XCohn1umvYkQswCTDMbtglvViPlMNxH67zvh4WesNLKiugpsBA5F9iqXo25BKUngE5YQ5lYdhm+ 9b7H6NmCNMYOIooRfxcjJFAVxpBcbLZvvZ9fIjJpJPcmwsg8 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_013438_620980_9C908334 X-CRM114-Status: GOOD ( 13.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 driver for further changes that will drop struct pwm_chip chip from struct rockchip_pwm_chip. Use the pwm_chip as driver data instead of the rockchip_pwm_chip to get access to the pwm_chip in rockchip_pwm_remove() without using pc->chip. Signed-off-by: Uwe Kleine-König --- drivers/pwm/pwm-rockchip.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c index a7c647e37837..c001eb6b17ae 100644 --- a/drivers/pwm/pwm-rockchip.c +++ b/drivers/pwm/pwm-rockchip.c @@ -296,6 +296,7 @@ MODULE_DEVICE_TABLE(of, rockchip_pwm_dt_ids); static int rockchip_pwm_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct rockchip_pwm_chip *pc; u32 enable_conf, ctrl; bool enabled; @@ -304,6 +305,7 @@ static int rockchip_pwm_probe(struct platform_device *pdev) pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); if (!pc) return -ENOMEM; + chip = &pc->chip; pc->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(pc->base)) @@ -337,18 +339,18 @@ static int rockchip_pwm_probe(struct platform_device *pdev) goto err_clk; } - platform_set_drvdata(pdev, pc); + platform_set_drvdata(pdev, chip); pc->data = device_get_match_data(&pdev->dev); - pc->chip.dev = &pdev->dev; - pc->chip.ops = &rockchip_pwm_ops; - pc->chip.npwm = 1; + chip->dev = &pdev->dev; + chip->ops = &rockchip_pwm_ops; + chip->npwm = 1; enable_conf = pc->data->enable_conf; ctrl = readl_relaxed(pc->base + pc->data->regs.ctrl); enabled = (ctrl & enable_conf) == enable_conf; - ret = pwmchip_add(&pc->chip); + ret = pwmchip_add(chip); if (ret < 0) { dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n"); goto err_pclk; @@ -372,9 +374,10 @@ static int rockchip_pwm_probe(struct platform_device *pdev) static void rockchip_pwm_remove(struct platform_device *pdev) { - struct rockchip_pwm_chip *pc = platform_get_drvdata(pdev); + struct pwm_chip *chip = platform_get_drvdata(pdev); + struct rockchip_pwm_chip *pc = to_rockchip_pwm_chip(chip); - pwmchip_remove(&pc->chip); + pwmchip_remove(chip); clk_unprepare(pc->pclk); clk_unprepare(pc->clk);