From patchwork Thu Jan 25 12:09:34 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: 13530883 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 B8606C48260 for ; Thu, 25 Jan 2024 14:08:51 +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=pmscLgaBK1U/+A/XXQvWWCwvuby0NTXaOc6Im8Od42c=; b=Kw1E4QR+Podewo S64ZyLaEYFAIwr1xhAsfjHCV/0mPQ1vp4vH4w6blCOvs6lr1TY4zT1ZIngbZH5j3/qbcu/KF8ssy8 oktIFwlx2X/eSWcZn+6Fg7LQSwEHl1tdjKYF/Lg8ZdTYw+lQpvvzQog1AmIUbqTfP17udTy/RcDm0 IM6NVafvqP92IcrKARrx5GyWS/AKXvIore6O+c7KNtbXoBwwqD2+9Q1OhKwdzbYs3DzJHqPpNIF3L ASgWD0wnIdvdT4iIA6mexeTttL7B5jZZSeA3iYFsRLlXJAEXT8wUJzvGlqn7ik0DSAr5YOyM1H37z tAprWqH6fWLXx1FlZ3Sw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT0PM-00000000FHJ-05Gh; Thu, 25 Jan 2024 14:08:44 +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 1rT0Oe-00000000Exx-46nv for linux-amlogic@bombadil.infradead.org; Thu, 25 Jan 2024 14:08:00 +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=DoBDSizlhGxg56AeVJwqv1E1op+2VJ/F7USVHLvNloM=; b=so5DE47wgPcktlEwtbxCDuT44I zDMoj9XPlvQZxbvlz504QJEm3/ar+cSvTWMux9dO9Zvw+42aNgN6GzmDF9bhXnaVqKjy4Apn2Lab9 FOz9w3EC1ZRrP7YuMVIqRKHGDYQs7ReC86oN3ySeQ2gTxfZswY0D/ifginQzkK9UcZizfrIHSlh7M SolI41quM/uyl/5QFhRpclmq2MAgkKbcLLTRHxPQ5NqE+FX2v89V7NH5WF9hv4xcilYNLeuT+uxKc GCYkzn/l4fJDrsAqfY2eYbRQPTrUAascyNRnseThohBttZuqyLGKIf/82ybh4uzRt3lhqZyHLAFNo +kg9xK8A==; 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 1rSybh-00000009sDZ-3gNT for linux-amlogic@lists.infradead.org; Thu, 25 Jan 2024 12:13:25 +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 1rSyZL-0004RC-OT; Thu, 25 Jan 2024 13:10:55 +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 1rSyZK-002HTN-8J; Thu, 25 Jan 2024 13:10:54 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rSyZK-007n2y-0X; Thu, 25 Jan 2024 13:10:54 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Neil Armstrong , Kevin Hilman , linux-pwm@vger.kernel.org Cc: Jerome Brunet , Martin Blumenstingl , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH v5 072/111] pwm: meson: Make use of devm_pwmchip_alloc() function Date: Thu, 25 Jan 2024 13:09:34 +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=2615; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=tbf+Q2Gxrb81SZI03PQrpWoV9hGmidTqVonqvgzF990=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlsk+Ps9GWUz16FfY73NvDjTCMhYVcOfguNy68z bzG8PvGCR2JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZbJPjwAKCRCPgPtYfRL+ TqjuCACTkTZutcwEYIAetP5/AnxvzOgESXYd5G4R2im/Y3HsmdptBtCo5AOOfuzXrbfejfnh74I iG5FTd+XcdAShxd3o91Yiv5Fc6ktPwv3ckxk+GDnd/y0+EKX9jAlgMP7ggC14b0Xg7MCL253ufx q0lV7JWwmrNn9n82i9O6PrzwH1IjQ5ZT6gNjm6ANh7oqn728Wk09If78UNy1De8YxVH+XLA5Bqz FLdS4pu+lb/I1bpLoTRfLI3rTuNAD3HGo6E/fAbexVkcUT0hJGYBbHEjJd7Y1NQ5YvDDwR169/2 DpoAM+Klwutd44wmbOSqFnbswNBAsYTAcmSJbij2W7ACJO0E 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-amlogic@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_121323_573711_D1EF2747 X-CRM114-Status: GOOD ( 12.16 ) X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org This prepares the pwm-meson 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-meson.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index dd0e18437be9..40a5b64c26f5 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -102,7 +102,6 @@ struct meson_pwm_data { }; struct meson_pwm { - struct pwm_chip chip; const struct meson_pwm_data *data; struct meson_pwm_channel channels[MESON_NUM_PWMS]; void __iomem *base; @@ -115,7 +114,7 @@ struct meson_pwm { static inline struct meson_pwm *to_meson_pwm(struct pwm_chip *chip) { - return container_of(chip, struct meson_pwm, chip); + return pwmchip_get_drvdata(chip); } static int meson_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) @@ -449,7 +448,7 @@ static int meson_pwm_init_channels(struct pwm_chip *chip) mux_parent_data[i].name = meson->data->parent_names[i]; } - for (i = 0; i < meson->chip.npwm; i++) { + for (i = 0; i < chip->npwm; i++) { struct meson_pwm_channel *channel = &meson->channels[i]; struct clk_parent_data div_parent = {}, gate_parent = {}; struct clk_init_data init = {}; @@ -529,29 +528,29 @@ static int meson_pwm_init_channels(struct pwm_chip *chip) static int meson_pwm_probe(struct platform_device *pdev) { + struct pwm_chip *chip; struct meson_pwm *meson; int err; - meson = devm_kzalloc(&pdev->dev, sizeof(*meson), GFP_KERNEL); - if (!meson) - return -ENOMEM; + chip = devm_pwmchip_alloc(&pdev->dev, MESON_NUM_PWMS, sizeof(*meson)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + meson = to_meson_pwm(chip); meson->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(meson->base)) return PTR_ERR(meson->base); spin_lock_init(&meson->lock); - meson->chip.dev = &pdev->dev; - meson->chip.ops = &meson_pwm_ops; - meson->chip.npwm = MESON_NUM_PWMS; + chip->ops = &meson_pwm_ops; meson->data = of_device_get_match_data(&pdev->dev); - err = meson_pwm_init_channels(&meson->chip); + err = meson_pwm_init_channels(chip); if (err < 0) return err; - err = devm_pwmchip_add(&pdev->dev, &meson->chip); + err = devm_pwmchip_add(&pdev->dev, chip); if (err < 0) return dev_err_probe(&pdev->dev, err, "failed to register PWM chip\n");