From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753302AbeBSPrZ (ORCPT ); Mon, 19 Feb 2018 10:47:25 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:57002 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753010AbeBSPpG (ORCPT ); Mon, 19 Feb 2018 10:45:06 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180219154504euoutp012720e71d1f9aa9ee36fb560ea2648f14~UxJGgtwJU0897708977euoutp01e X-AuditID: cbfec7f2-5ffe19c000011644-4b-5a8af0fcb8d6 From: Maciej Purski To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: Michael Turquette , Stephen Boyd , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , David Airlie , Kukjin Kim , Krzysztof Kozlowski , Mauro Carvalho Chehab , Andrzej Pietrasiewicz , Jacek Anaszewski , Kamil Debski , Jeongtae Park , Andrzej Hajda , Russell King , Sylwester Nawrocki , Thibault Saunier , Javier Martinez Canillas , Hans Verkuil , Hoegeun Kwon , Bartlomiej Zolnierkiewicz , Marek Szyprowski , Maciej Purski Subject: [PATCH 3/8] drm/exynos/decon: Use clk bulk API Date: Mon, 19 Feb 2018 16:44:01 +0100 Message-id: <1519055046-2399-4-git-send-email-m.purski@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1519055046-2399-1-git-send-email-m.purski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSe0hTYRjG+8591uIwo32Z+ccgMiFrEPRBF7Iyzh8SJUSxrqc8aeRW7Khl SU5JzVmps9LsZhZapqVzLi+si60spcnUtCwvuCCX1qylmJm1Ofvv4Xl+3/O+L3wMLrOSAcxh TZyg1fCxCsqPML/81bpsckSvWqErl6DuBzYSnbe9xlChM4NAVQUPSdQx6qLQSO4VgFylegoZ +nII9KGmkkDDX8sxZK14i6HBXjuBrrzKIFG2YwhHra2VNHqTOkwjo6OTRN/P9ZKovf4ahc5V 1pCooPUxhhovWQAqcnYTqMLaQ6MS4ySG7M3h6Pmwp2Sqs4pABXlOCrmfGvD1QVx7px3nXO/S aO7i7yqSqyvsoTljWSbFPRrrJ7m+rCaMq76TzJmyPf4FUxng3MYgrsOaQm+do/JbEyXEHk4Q tMvX7feLcUwOgmOOwBPVXUodaJHrgYSB7EpYXNpFebWMvQtgXjWuB34e7QbQZhmg/0Nt6bnA F5QAOH79GuZ78RfAlu4IPWAYig2B5Rn7vPY89iWAN+oivDzOjtEwZ+IZ8Ab+7Cr4wmKYLiXY xbD0fvu0L2U3woZJHe4bFgTf2zKntYTdBPsbLJS3CLLdNKz9Yad80Cb49nYH5tP+8EuTaWbT QNiel0X49CloH62f4ZNgyofKGWY1dBtM0wNwdi40mPNx7wGQlcKz6TIfwkFz2o0ZOwz+/ET7 zs0HsHQoIgcEFIFZZUAuxIvqaEFUaoTjoSKvFuM10aEHj6qNwPO3WqaaftSC0bYDjYBlgGKO lO3Rq2QknyAmqhsBZHDFPGnEO48ljeITTwrao/u08bGC2AgWMoRCLt0bfFolY6P5OOGIIBwT tP9TjJEE6AC4Rzo2b3OG7BmPusx37dqt7KwO2+MIT1bXujIHzHGHKlRrG4q2BEcWnDGk7Fzg CujIz4z5U5dqKVv27fOdqAd5kim1Oalhx6gpeUlaiJt3bm/eMDB/f7FOYeuxPrPKNUXvleLV m9G09qM8YVh9qzB84u+TgcgjiYsMqUtnp+euUhBiDK8MwbUi/w8pgevYVwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAAzWRXUhTcQDF/d/de3e3NrhMwauGD6PClMxF1P9hmWXBfRAK7Gkv65I3Pzd1 VyWFagppLvMrB84irEzBstzULM2y+VmiUzfnR80pK9ScqZmCNaxN6e3HOYdzHg7BkxjQYCJZ ncVq1EyaFBeiQzsD9iO/13SKqEcfhHDmxQgG7458RGDNUhEKjdUvMWjbXMXhWoUBwNUGHQ4r neUo/NzWjEL3ynME9jZNIHBxdgyFhsEiDJa5lnnQYmnmw+ECNx+aXHYMrpfMYtDa8QCHJc1t GKy2vEOgWd8FYO3SDAqbeh18WG/yIHDs03nY4/aW7NiNKKy+t4TDje5KXkwobbWP8ejVqVt8 uuqPEaPf1Dj4tKmxGKfbt+Yw2nlnAKFb6m7SrWVevbS1EdAbplDa1pvPvyhSCOUJbFpyDqs5 Gn1ZmOTyLIIM1/5rLZMyLRgK1AEBQZHHqfHCCqADQkJC1gGqsMCM+QwJmY9Q24NKHSAInAyn nhcpfZkAsh9Q81+e7GZ4pIdPlWozfOxPnqT6uir5PkbJg1TDMyvwsZiMpTo9Wt7eWCg1PVK8 ywLyHDXX2YXvbcVSFuc4Xg5EtcCvEQSw2ZwqUcUdi+QYFZetToy8kq4yAe9hr/q3W18D3Y94 MyAJIBWJSYdOIcGYHC5XZQYUwZMGiOOmvJI4gcnNYzXpSk12GsuZQQiBSgPFlqhchYRMZLLY VJbNYDX/XYQQBGtBlprNG+2rCnFQowbhQNipsyvy0W8iy0LmzxiZX1tcxL68S2eU9+2H41n2 tm1+hT3wtiOlJHozwn/SIghb/6qf6KDlw6cdW91W48R1Y9NCee3V9ijB08fvpzPrY1KCJLJh +ZrEmXoIRy602Mr0y1M9c/rv7sHwG39PMA+D6F9SlEtiZOE8Dcf8A+1cCC6sAgAA X-CMS-MailID: 20180219154458eucas1p1b4e728757e78f3d5dde5c9aa565a5d20 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180219154458eucas1p1b4e728757e78f3d5dde5c9aa565a5d20 X-RootMTR: 20180219154458eucas1p1b4e728757e78f3d5dde5c9aa565a5d20 References: <1519055046-2399-1-git-send-email-m.purski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using bulk clk functions simplifies the driver's code. Use devm_clk_bulk functions instead of iterating over an array of clks. Signed-off-by: Maciej Purski --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 50 ++++++++------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 1c330f2..1760fcb 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -55,7 +55,7 @@ struct decon_context { struct exynos_drm_plane_config configs[WINDOWS_NR]; void __iomem *addr; struct regmap *sysreg; - struct clk *clks[ARRAY_SIZE(decon_clks_name)]; + struct clk_bulk_data *clks; unsigned int irq; unsigned int irq_vsync; unsigned int irq_lcd_sys; @@ -485,15 +485,13 @@ static irqreturn_t decon_te_irq_handler(int irq, void *dev_id) static void decon_clear_channels(struct exynos_drm_crtc *crtc) { struct decon_context *ctx = crtc->ctx; - int win, i, ret; + int win, ret; DRM_DEBUG_KMS("%s\n", __FILE__); - for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) { - ret = clk_prepare_enable(ctx->clks[i]); - if (ret < 0) - goto err; - } + ret = clk_bulk_prepare_enable(ARRAY_SIZE(decon_clks_name), ctx->clks); + if (ret < 0) + return; decon_shadow_protect(ctx, true); for (win = 0; win < WINDOWS_NR; win++) @@ -504,10 +502,6 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc) /* TODO: wait for possible vsync */ msleep(50); - -err: - while (--i >= 0) - clk_disable_unprepare(ctx->clks[i]); } static enum drm_mode_status decon_mode_valid(struct exynos_drm_crtc *crtc, @@ -638,10 +632,8 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id) static int exynos5433_decon_suspend(struct device *dev) { struct decon_context *ctx = dev_get_drvdata(dev); - int i = ARRAY_SIZE(decon_clks_name); - while (--i >= 0) - clk_disable_unprepare(ctx->clks[i]); + clk_bulk_disable_unprepare(ARRAY_SIZE(decon_clks_name), ctx->clks); return 0; } @@ -649,19 +641,9 @@ static int exynos5433_decon_suspend(struct device *dev) static int exynos5433_decon_resume(struct device *dev) { struct decon_context *ctx = dev_get_drvdata(dev); - int i, ret; - - for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) { - ret = clk_prepare_enable(ctx->clks[i]); - if (ret < 0) - goto err; - } - - return 0; + int ret; -err: - while (--i >= 0) - clk_disable_unprepare(ctx->clks[i]); + ret = clk_bulk_prepare_enable(ARRAY_SIZE(decon_clks_name), ctx->clks); return ret; } @@ -719,7 +701,6 @@ static int exynos5433_decon_probe(struct platform_device *pdev) struct decon_context *ctx; struct resource *res; int ret; - int i; ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -732,15 +713,14 @@ static int exynos5433_decon_probe(struct platform_device *pdev) if (ctx->out_type & IFTYPE_HDMI) ctx->first_win = 1; - for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) { - struct clk *clk; - - clk = devm_clk_get(ctx->dev, decon_clks_name[i]); - if (IS_ERR(clk)) - return PTR_ERR(clk); + ctx->clks = devm_clk_bulk_alloc(dev, ARRAY_SIZE(decon_clks_name), + decon_clks_name); + if (IS_ERR(ctx->clks)) + return PTR_ERR(ctx->clks); - ctx->clks[i] = clk; - } + ret = devm_clk_bulk_get(dev, ARRAY_SIZE(decon_clks_name), ctx->clks); + if (ret < 0) + return ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ctx->addr = devm_ioremap_resource(dev, res); -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maciej Purski Subject: [PATCH 3/8] drm/exynos/decon: Use clk bulk API Date: Mon, 19 Feb 2018 16:44:01 +0100 Message-ID: <1519055046-2399-4-git-send-email-m.purski@samsung.com> References: <1519055046-2399-1-git-send-email-m.purski@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-reply-to: <1519055046-2399-1-git-send-email-m.purski@samsung.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: David Airlie , Michael Turquette , Kamil Debski , Maciej Purski , Sylwester Nawrocki , Marek Szyprowski , Thibault Saunier , Russell King , Krzysztof Kozlowski , Javier Martinez Canillas , Kukjin Kim , Hoegeun Kwon , Bartlomiej Zolnierkiewicz , Jeongtae Park , Jacek Anaszewski , Andrzej Pietrasiewicz , Mauro Carvalho Chehab , Stephen Boyd , Seung-Woo Kim , Hans Verkuil , Kyungmin Park List-Id: linux-samsung-soc@vger.kernel.org VXNpbmcgYnVsayBjbGsgZnVuY3Rpb25zIHNpbXBsaWZpZXMgdGhlIGRyaXZlcidzIGNvZGUuIFVz ZSBkZXZtX2Nsa19idWxrCmZ1bmN0aW9ucyBpbnN0ZWFkIG9mIGl0ZXJhdGluZyBvdmVyIGFuIGFy cmF5IG9mIGNsa3MuCgpTaWduZWQtb2ZmLWJ5OiBNYWNpZWogUHVyc2tpIDxtLnB1cnNraUBzYW1z dW5nLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vczU0MzNfZHJtX2RlY29u LmMgfCA1MCArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBp bnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZXh5bm9zL2V4eW5vczU0MzNfZHJtX2RlY29uLmMgYi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9z L2V4eW5vczU0MzNfZHJtX2RlY29uLmMKaW5kZXggMWMzMzBmMi4uMTc2MGZjYiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3M1NDMzX2RybV9kZWNvbi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zNTQzM19kcm1fZGVjb24uYwpAQCAtNTUsNyArNTUs NyBAQCBzdHJ1Y3QgZGVjb25fY29udGV4dCB7CiAJc3RydWN0IGV4eW5vc19kcm1fcGxhbmVfY29u ZmlnCWNvbmZpZ3NbV0lORE9XU19OUl07CiAJdm9pZCBfX2lvbWVtCQkJKmFkZHI7CiAJc3RydWN0 IHJlZ21hcAkJCSpzeXNyZWc7Ci0Jc3RydWN0IGNsawkJCSpjbGtzW0FSUkFZX1NJWkUoZGVjb25f Y2xrc19uYW1lKV07CisJc3RydWN0IGNsa19idWxrX2RhdGEJCSpjbGtzOwogCXVuc2lnbmVkIGlu dAkJCWlycTsKIAl1bnNpZ25lZCBpbnQJCQlpcnFfdnN5bmM7CiAJdW5zaWduZWQgaW50CQkJaXJx X2xjZF9zeXM7CkBAIC00ODUsMTUgKzQ4NSwxMyBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZGVjb25f dGVfaXJxX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqZGV2X2lkKQogc3RhdGljIHZvaWQgZGVjb25f Y2xlYXJfY2hhbm5lbHMoc3RydWN0IGV4eW5vc19kcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3Qg ZGVjb25fY29udGV4dCAqY3R4ID0gY3J0Yy0+Y3R4OwotCWludCB3aW4sIGksIHJldDsKKwlpbnQg d2luLCByZXQ7CiAKIAlEUk1fREVCVUdfS01TKCIlc1xuIiwgX19GSUxFX18pOwogCi0JZm9yIChp ID0gMDsgaSA8IEFSUkFZX1NJWkUoZGVjb25fY2xrc19uYW1lKTsgaSsrKSB7Ci0JCXJldCA9IGNs a19wcmVwYXJlX2VuYWJsZShjdHgtPmNsa3NbaV0pOwotCQlpZiAocmV0IDwgMCkKLQkJCWdvdG8g ZXJyOwotCX0KKwlyZXQgPSBjbGtfYnVsa19wcmVwYXJlX2VuYWJsZShBUlJBWV9TSVpFKGRlY29u X2Nsa3NfbmFtZSksIGN0eC0+Y2xrcyk7CisJaWYgKHJldCA8IDApCisJCXJldHVybjsKIAogCWRl Y29uX3NoYWRvd19wcm90ZWN0KGN0eCwgdHJ1ZSk7CiAJZm9yICh3aW4gPSAwOyB3aW4gPCBXSU5E T1dTX05SOyB3aW4rKykKQEAgLTUwNCwxMCArNTAyLDYgQEAgc3RhdGljIHZvaWQgZGVjb25fY2xl YXJfY2hhbm5lbHMoc3RydWN0IGV4eW5vc19kcm1fY3J0YyAqY3J0YykKIAogCS8qIFRPRE86IHdh aXQgZm9yIHBvc3NpYmxlIHZzeW5jICovCiAJbXNsZWVwKDUwKTsKLQotZXJyOgotCXdoaWxlICgt LWkgPj0gMCkKLQkJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGN0eC0+Y2xrc1tpXSk7CiB9CiAKIHN0 YXRpYyBlbnVtIGRybV9tb2RlX3N0YXR1cyBkZWNvbl9tb2RlX3ZhbGlkKHN0cnVjdCBleHlub3Nf ZHJtX2NydGMgKmNydGMsCkBAIC02MzgsMTAgKzYzMiw4IEBAIHN0YXRpYyBpcnFyZXR1cm5fdCBk ZWNvbl9pcnFfaGFuZGxlcihpbnQgaXJxLCB2b2lkICpkZXZfaWQpCiBzdGF0aWMgaW50IGV4eW5v czU0MzNfZGVjb25fc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRlY29u X2NvbnRleHQgKmN0eCA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwotCWludCBpID0gQVJSQVlfU0la RShkZWNvbl9jbGtzX25hbWUpOwogCi0Jd2hpbGUgKC0taSA+PSAwKQotCQljbGtfZGlzYWJsZV91 bnByZXBhcmUoY3R4LT5jbGtzW2ldKTsKKwljbGtfYnVsa19kaXNhYmxlX3VucHJlcGFyZShBUlJB WV9TSVpFKGRlY29uX2Nsa3NfbmFtZSksIGN0eC0+Y2xrcyk7CiAKIAlyZXR1cm4gMDsKIH0KQEAg LTY0OSwxOSArNjQxLDkgQEAgc3RhdGljIGludCBleHlub3M1NDMzX2RlY29uX3N1c3BlbmQoc3Ry dWN0IGRldmljZSAqZGV2KQogc3RhdGljIGludCBleHlub3M1NDMzX2RlY29uX3Jlc3VtZShzdHJ1 Y3QgZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRlY29uX2NvbnRleHQgKmN0eCA9IGRldl9nZXRf ZHJ2ZGF0YShkZXYpOwotCWludCBpLCByZXQ7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0la RShkZWNvbl9jbGtzX25hbWUpOyBpKyspIHsKLQkJcmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKGN0 eC0+Y2xrc1tpXSk7Ci0JCWlmIChyZXQgPCAwKQotCQkJZ290byBlcnI7Ci0JfQotCi0JcmV0dXJu IDA7CisJaW50IHJldDsKIAotZXJyOgotCXdoaWxlICgtLWkgPj0gMCkKLQkJY2xrX2Rpc2FibGVf dW5wcmVwYXJlKGN0eC0+Y2xrc1tpXSk7CisJcmV0ID0gY2xrX2J1bGtfcHJlcGFyZV9lbmFibGUo QVJSQVlfU0laRShkZWNvbl9jbGtzX25hbWUpLCBjdHgtPmNsa3MpOwogCiAJcmV0dXJuIHJldDsK IH0KQEAgLTcxOSw3ICs3MDEsNiBAQCBzdGF0aWMgaW50IGV4eW5vczU0MzNfZGVjb25fcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlzdHJ1Y3QgZGVjb25fY29udGV4dCAqY3R4 OwogCXN0cnVjdCByZXNvdXJjZSAqcmVzOwogCWludCByZXQ7Ci0JaW50IGk7CiAKIAljdHggPSBk ZXZtX2t6YWxsb2MoZGV2LCBzaXplb2YoKmN0eCksIEdGUF9LRVJORUwpOwogCWlmICghY3R4KQpA QCAtNzMyLDE1ICs3MTMsMTQgQEAgc3RhdGljIGludCBleHlub3M1NDMzX2RlY29uX3Byb2JlKHN0 cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJaWYgKGN0eC0+b3V0X3R5cGUgJiBJRlRZUEVf SERNSSkKIAkJY3R4LT5maXJzdF93aW4gPSAxOwogCi0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJ WkUoZGVjb25fY2xrc19uYW1lKTsgaSsrKSB7Ci0JCXN0cnVjdCBjbGsgKmNsazsKLQotCQljbGsg PSBkZXZtX2Nsa19nZXQoY3R4LT5kZXYsIGRlY29uX2Nsa3NfbmFtZVtpXSk7Ci0JCWlmIChJU19F UlIoY2xrKSkKLQkJCXJldHVybiBQVFJfRVJSKGNsayk7CisJY3R4LT5jbGtzID0gZGV2bV9jbGtf YnVsa19hbGxvYyhkZXYsIEFSUkFZX1NJWkUoZGVjb25fY2xrc19uYW1lKSwKKwkJCQkJZGVjb25f Y2xrc19uYW1lKTsKKwlpZiAoSVNfRVJSKGN0eC0+Y2xrcykpCisJCXJldHVybiBQVFJfRVJSKGN0 eC0+Y2xrcyk7CiAKLQkJY3R4LT5jbGtzW2ldID0gY2xrOwotCX0KKwlyZXQgPSBkZXZtX2Nsa19i dWxrX2dldChkZXYsIEFSUkFZX1NJWkUoZGVjb25fY2xrc19uYW1lKSwgY3R4LT5jbGtzKTsKKwlp ZiAocmV0IDwgMCkKKwkJcmV0dXJuIHJldDsKIAogCXJlcyA9IHBsYXRmb3JtX2dldF9yZXNvdXJj ZShwZGV2LCBJT1JFU09VUkNFX01FTSwgMCk7CiAJY3R4LT5hZGRyID0gZGV2bV9pb3JlbWFwX3Jl c291cmNlKGRldiwgcmVzKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: m.purski@samsung.com (Maciej Purski) Date: Mon, 19 Feb 2018 16:44:01 +0100 Subject: [PATCH 3/8] drm/exynos/decon: Use clk bulk API In-Reply-To: <1519055046-2399-1-git-send-email-m.purski@samsung.com> References: <1519055046-2399-1-git-send-email-m.purski@samsung.com> Message-ID: <1519055046-2399-4-git-send-email-m.purski@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Using bulk clk functions simplifies the driver's code. Use devm_clk_bulk functions instead of iterating over an array of clks. Signed-off-by: Maciej Purski --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 50 ++++++++------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 1c330f2..1760fcb 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -55,7 +55,7 @@ struct decon_context { struct exynos_drm_plane_config configs[WINDOWS_NR]; void __iomem *addr; struct regmap *sysreg; - struct clk *clks[ARRAY_SIZE(decon_clks_name)]; + struct clk_bulk_data *clks; unsigned int irq; unsigned int irq_vsync; unsigned int irq_lcd_sys; @@ -485,15 +485,13 @@ static irqreturn_t decon_te_irq_handler(int irq, void *dev_id) static void decon_clear_channels(struct exynos_drm_crtc *crtc) { struct decon_context *ctx = crtc->ctx; - int win, i, ret; + int win, ret; DRM_DEBUG_KMS("%s\n", __FILE__); - for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) { - ret = clk_prepare_enable(ctx->clks[i]); - if (ret < 0) - goto err; - } + ret = clk_bulk_prepare_enable(ARRAY_SIZE(decon_clks_name), ctx->clks); + if (ret < 0) + return; decon_shadow_protect(ctx, true); for (win = 0; win < WINDOWS_NR; win++) @@ -504,10 +502,6 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc) /* TODO: wait for possible vsync */ msleep(50); - -err: - while (--i >= 0) - clk_disable_unprepare(ctx->clks[i]); } static enum drm_mode_status decon_mode_valid(struct exynos_drm_crtc *crtc, @@ -638,10 +632,8 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id) static int exynos5433_decon_suspend(struct device *dev) { struct decon_context *ctx = dev_get_drvdata(dev); - int i = ARRAY_SIZE(decon_clks_name); - while (--i >= 0) - clk_disable_unprepare(ctx->clks[i]); + clk_bulk_disable_unprepare(ARRAY_SIZE(decon_clks_name), ctx->clks); return 0; } @@ -649,19 +641,9 @@ static int exynos5433_decon_suspend(struct device *dev) static int exynos5433_decon_resume(struct device *dev) { struct decon_context *ctx = dev_get_drvdata(dev); - int i, ret; - - for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) { - ret = clk_prepare_enable(ctx->clks[i]); - if (ret < 0) - goto err; - } - - return 0; + int ret; -err: - while (--i >= 0) - clk_disable_unprepare(ctx->clks[i]); + ret = clk_bulk_prepare_enable(ARRAY_SIZE(decon_clks_name), ctx->clks); return ret; } @@ -719,7 +701,6 @@ static int exynos5433_decon_probe(struct platform_device *pdev) struct decon_context *ctx; struct resource *res; int ret; - int i; ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -732,15 +713,14 @@ static int exynos5433_decon_probe(struct platform_device *pdev) if (ctx->out_type & IFTYPE_HDMI) ctx->first_win = 1; - for (i = 0; i < ARRAY_SIZE(decon_clks_name); i++) { - struct clk *clk; - - clk = devm_clk_get(ctx->dev, decon_clks_name[i]); - if (IS_ERR(clk)) - return PTR_ERR(clk); + ctx->clks = devm_clk_bulk_alloc(dev, ARRAY_SIZE(decon_clks_name), + decon_clks_name); + if (IS_ERR(ctx->clks)) + return PTR_ERR(ctx->clks); - ctx->clks[i] = clk; - } + ret = devm_clk_bulk_get(dev, ARRAY_SIZE(decon_clks_name), ctx->clks); + if (ret < 0) + return ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ctx->addr = devm_ioremap_resource(dev, res); -- 2.7.4