From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753173AbeBSPpP (ORCPT ); Mon, 19 Feb 2018 10:45:15 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:56987 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753004AbeBSPpG (ORCPT ); Mon, 19 Feb 2018 10:45:06 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180219154503euoutp01e6a00a0bf5d355875958a63ffc9fd0f7~UxJFpZ3hR0897708977euoutp01d X-AuditID: cbfec7f2-5ffe19c000011644-48-5a8af0fb6cec 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 2/8] media: s5p-jpeg: Use bulk clk API Date: Mon, 19 Feb 2018 16:44:00 +0100 Message-id: <1519055046-2399-3-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: H4sIAAAAAAAAAzWSe0iTURjGO99dcXKY0g6WRqOiBDPD6nTBbgYfJBHUPw26rPxSyVltXiqt 1CzdyktW3iqxKAuv25qVitGmuLJyWSle8gJ2cWWpW3YVbXP63+88z/O+D+dwOFJspn24qJhY QRkjj5Yy7tTD5j+WgH+jGtmK4usS3F3VSuPM1ucELrKmU1hXUE3jd+MjDB69XAjwyD0Ng3P7 cyjcU6Ol8PC3CgI3VbYTeKivjcKFz9JpnD34lcQWi5bFr1KHWawf7KDx2KU+Gr+tu8HgS9oa GhdYnhDYdK0B4BJrN4Urm3pZXKqfIHBbyzbcOOxYMtmho3DBFSuD7U9zyU1+/NuONpIf6TzP 8lf/6Wi+tqiX5fVlaoZ/9HOA5vsvmgn+wZ2zvCHboWcZygBv1/vx75pS2J0eMvcN4UJ0VLyg DAw54B5ZZrPRxz75nhgst1DJ4A3SADcOwWBUOnqOcLIY3gdIO+CvAe4OtgOkSztPzoYmjFrC ZZQClJ01BVyHKYBemP+wGsBxDPRHFen7nQPesBmg4towZ4aEP1mU89cInIYXXI2qBm/STqbg YqT90TddLYJb0W9DO+tq80NdrerpZjcYigbqGxjnIgQ7WDT2vXwmFIoKbl+kXeyFvpgNM/p8 pM4wEi5ORG3jdYyLk1BKj3Ymsx7Zcw3TBST0RLkP80nnBRAUoYwLYleER79ujMyMbkYPdGm0 64nyAbpWw+YAnxIwpwxIhDiVIkJQBcUICctVcoUqLiZi+aGjCj1wfK8Xk2bbYzD+5qAJQA5I PUSwVyMT0/J41UmFCSCOlHqLwjodkihcfvKUoDy6XxkXLahMYB5HSSWifUvPyMQwQh4rHBGE Y4Jy1iU4N59kULELhtQ3VzTKbp0YavG1L5IesoU0qwszg3v8Pr422V6utQdo9uxdGrh7kbF6 HZtGofdwtP34ltg4nBo89iFnpXdKb8CniR2ndQuX9G9ctn1uUL9nYurnNXeNAX8rF3RaWQ/J r7wuWd5wgnWsqqhUsWrn78MTVHi9m3rJpN6eVK6VUqpIeZA/qVTJ/wM1XjvzWgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAAzWRa0hTYRjHe89d2+iwhA5WBkOLNE0p5AVFIguOIBQFfRiFnvKgllPZcSOF yBklLu8pqS0wk4p5aZv3RMklaooub8vMbcbKGpmapiSu2Zb07ff8/s/lw0OhkkeYP5WansUr 0rk0KeGLjbgHLaGbKxpZuN6KwtnmMRwWjb1FYI0zH4OGqpc4nFpfJuBKWTWAy881BCy3l2Lw Y5seg4s/GhHY3zSNwG+2cQxWD+XjsMTxHYVms56Eo3mLJDQ6LDj8WWjD4eQrLQEL9W04rDL3 ItBU2QNgrXMWg039VhI+M7oQOD58Fr5Z9CxxWwwYrHrgJODa63L0VAA7aRlH2eWZuyRbsWXA 2a4aK8kadQUE27Exj7P2+4MI21J/m20t8fjiVh1g14wB7FS/mjwvkvlGJ/FpqSpecTwm0TdF t7qKZy4cvOloMGO5YILRAB+KoU8yrj49ogG+lISuB0xTpw7dKdQIU7et9iQURdDBTGN+gtf7 0QOA+TT3FPdOo7SLZIpzM728l45kmh2P/3mMDmL0v2yIl8V0LPO7dZrcuRbAfBgrQL3sQ59h 5rt7CC9LPD1m+wRRCkS1YJcO+PFKQZ4sFyLCBE4uKNOTw65lyI3A87L2gc2WTjBhuGgCNAWk IjFt1cgkOKcSsuUmwFCo1E8cP+NR4iQuO4dXZCQolGm8YAL7KUy6T2wOz5ZJ6GQui7/B85m8 4n+KUD7+uYCzRakih0JOBMWUV0fZ3aF/irbaZX3bNXA4dvSodrdq9EuXct2R6Aox9G405o1s Oecq43pfrM2GtVzptk3dOqz9emDp0CY9I1ToS5curx7pYQI7rssCtZUNd85pLu2RX3Zd6B48 ppbFicHCVVHzwyfvDYZ38XU57jLT6c/3opOkmJDCRQSjCoH7C+Xv4JWuAgAA X-CMS-MailID: 20180219154457eucas1p163264992903698a8878aa5abbc8aa17b X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180219154457eucas1p163264992903698a8878aa5abbc8aa17b X-RootMTR: 20180219154457eucas1p163264992903698a8878aa5abbc8aa17b 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/media/platform/s5p-jpeg/jpeg-core.c | 45 ++++++++++++----------------- drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 +- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 79b63da..681a515 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -2903,7 +2903,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev) { struct s5p_jpeg *jpeg; struct resource *res; - int i, ret; + int ret; /* JPEG IP abstraction struct */ jpeg = devm_kzalloc(&pdev->dev, sizeof(struct s5p_jpeg), GFP_KERNEL); @@ -2938,15 +2938,16 @@ static int s5p_jpeg_probe(struct platform_device *pdev) } /* clocks */ - for (i = 0; i < jpeg->variant->num_clocks; i++) { - jpeg->clocks[i] = devm_clk_get(&pdev->dev, - jpeg->variant->clk_names[i]); - if (IS_ERR(jpeg->clocks[i])) { - dev_err(&pdev->dev, "failed to get clock: %s\n", - jpeg->variant->clk_names[i]); - return PTR_ERR(jpeg->clocks[i]); - } - } + jpeg->clocks = devm_clk_bulk_alloc(&pdev->dev, + jpeg->variant->num_clocks, + jpeg->variant->clk_names); + if (IS_ERR(jpeg->clocks)) + return PTR_ERR(jpeg->clocks); + + ret = devm_clk_bulk_get(&pdev->dev, jpeg->variant->num_clocks, + jpeg->clocks); + if (ret < 0) + return ret; /* v4l2 device */ ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev); @@ -3047,7 +3048,6 @@ static int s5p_jpeg_probe(struct platform_device *pdev) static int s5p_jpeg_remove(struct platform_device *pdev) { struct s5p_jpeg *jpeg = platform_get_drvdata(pdev); - int i; pm_runtime_disable(jpeg->dev); @@ -3058,8 +3058,8 @@ static int s5p_jpeg_remove(struct platform_device *pdev) v4l2_device_unregister(&jpeg->v4l2_dev); if (!pm_runtime_status_suspended(&pdev->dev)) { - for (i = jpeg->variant->num_clocks - 1; i >= 0; i--) - clk_disable_unprepare(jpeg->clocks[i]); + clk_bulk_disable_unprepare(jpeg->variant->num_clocks, + jpeg->clocks); } return 0; @@ -3069,10 +3069,8 @@ static int s5p_jpeg_remove(struct platform_device *pdev) static int s5p_jpeg_runtime_suspend(struct device *dev) { struct s5p_jpeg *jpeg = dev_get_drvdata(dev); - int i; - for (i = jpeg->variant->num_clocks - 1; i >= 0; i--) - clk_disable_unprepare(jpeg->clocks[i]); + clk_bulk_disable_unprepare(jpeg->variant->num_clocks, jpeg->clocks); return 0; } @@ -3081,16 +3079,11 @@ static int s5p_jpeg_runtime_resume(struct device *dev) { struct s5p_jpeg *jpeg = dev_get_drvdata(dev); unsigned long flags; - int i, ret; - - for (i = 0; i < jpeg->variant->num_clocks; i++) { - ret = clk_prepare_enable(jpeg->clocks[i]); - if (ret) { - while (--i >= 0) - clk_disable_unprepare(jpeg->clocks[i]); - return ret; - } - } + int ret; + + ret = clk_bulk_prepare_enable(jpeg->variant->num_clocks, jpeg->clocks); + if (ret) + return ret; spin_lock_irqsave(&jpeg->slock, flags); diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/s5p-jpeg/jpeg-core.h index a46465e..dc6ed98 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.h @@ -133,7 +133,7 @@ struct s5p_jpeg { void __iomem *regs; unsigned int irq; enum exynos4_jpeg_result irq_ret; - struct clk *clocks[JPEG_MAX_CLOCKS]; + struct clk_bulk_data *clocks; struct device *dev; struct s5p_jpeg_variant *variant; u32 irq_status; -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maciej Purski Subject: [PATCH 2/8] media: s5p-jpeg: Use bulk clk API Date: Mon, 19 Feb 2018 16:44:00 +0100 Message-ID: <1519055046-2399-3-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 dW5nLmNvbT4KLS0tCiBkcml2ZXJzL21lZGlhL3BsYXRmb3JtL3M1cC1qcGVnL2pwZWctY29yZS5j IHwgNDUgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvbWVkaWEvcGxhdGZv cm0vczVwLWpwZWcvanBlZy1jb3JlLmggfCAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNl cnRpb25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3Bs YXRmb3JtL3M1cC1qcGVnL2pwZWctY29yZS5jIGIvZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS9zNXAt anBlZy9qcGVnLWNvcmUuYwppbmRleCA3OWI2M2RhLi42ODFhNTE1IDEwMDY0NAotLS0gYS9kcml2 ZXJzL21lZGlhL3BsYXRmb3JtL3M1cC1qcGVnL2pwZWctY29yZS5jCisrKyBiL2RyaXZlcnMvbWVk aWEvcGxhdGZvcm0vczVwLWpwZWcvanBlZy1jb3JlLmMKQEAgLTI5MDMsNyArMjkwMyw3IEBAIHN0 YXRpYyBpbnQgczVwX2pwZWdfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIHsK IAlzdHJ1Y3QgczVwX2pwZWcgKmpwZWc7CiAJc3RydWN0IHJlc291cmNlICpyZXM7Ci0JaW50IGks IHJldDsKKwlpbnQgcmV0OwogCiAJLyogSlBFRyBJUCBhYnN0cmFjdGlvbiBzdHJ1Y3QgKi8KIAlq cGVnID0gZGV2bV9remFsbG9jKCZwZGV2LT5kZXYsIHNpemVvZihzdHJ1Y3QgczVwX2pwZWcpLCBH RlBfS0VSTkVMKTsKQEAgLTI5MzgsMTUgKzI5MzgsMTYgQEAgc3RhdGljIGludCBzNXBfanBlZ19w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCX0KIAogCS8qIGNsb2NrcyAqLwot CWZvciAoaSA9IDA7IGkgPCBqcGVnLT52YXJpYW50LT5udW1fY2xvY2tzOyBpKyspIHsKLQkJanBl Zy0+Y2xvY2tzW2ldID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsCi0JCQkJCSAgICAgIGpwZWct PnZhcmlhbnQtPmNsa19uYW1lc1tpXSk7Ci0JCWlmIChJU19FUlIoanBlZy0+Y2xvY2tzW2ldKSkg ewotCQkJZGV2X2VycigmcGRldi0+ZGV2LCAiZmFpbGVkIHRvIGdldCBjbG9jazogJXNcbiIsCi0J CQkJanBlZy0+dmFyaWFudC0+Y2xrX25hbWVzW2ldKTsKLQkJCXJldHVybiBQVFJfRVJSKGpwZWct PmNsb2Nrc1tpXSk7Ci0JCX0KLQl9CisJanBlZy0+Y2xvY2tzID0gZGV2bV9jbGtfYnVsa19hbGxv YygmcGRldi0+ZGV2LAorCQkJCQkgICBqcGVnLT52YXJpYW50LT5udW1fY2xvY2tzLAorCQkJCQkg ICBqcGVnLT52YXJpYW50LT5jbGtfbmFtZXMpOworCWlmIChJU19FUlIoanBlZy0+Y2xvY2tzKSkK KwkJcmV0dXJuIFBUUl9FUlIoanBlZy0+Y2xvY2tzKTsKKworCXJldCA9IGRldm1fY2xrX2J1bGtf Z2V0KCZwZGV2LT5kZXYsIGpwZWctPnZhcmlhbnQtPm51bV9jbG9ja3MsCisJCQkJanBlZy0+Y2xv Y2tzKTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0dXJuIHJldDsKIAogCS8qIHY0bDIgZGV2aWNlICov CiAJcmV0ID0gdjRsMl9kZXZpY2VfcmVnaXN0ZXIoJnBkZXYtPmRldiwgJmpwZWctPnY0bDJfZGV2 KTsKQEAgLTMwNDcsNyArMzA0OCw2IEBAIHN0YXRpYyBpbnQgczVwX2pwZWdfcHJvYmUoc3RydWN0 IHBsYXRmb3JtX2RldmljZSAqcGRldikKIHN0YXRpYyBpbnQgczVwX2pwZWdfcmVtb3ZlKHN0cnVj dCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiB7CiAJc3RydWN0IHM1cF9qcGVnICpqcGVnID0gcGxh dGZvcm1fZ2V0X2RydmRhdGEocGRldik7Ci0JaW50IGk7CiAKIAlwbV9ydW50aW1lX2Rpc2FibGUo anBlZy0+ZGV2KTsKIApAQCAtMzA1OCw4ICszMDU4LDggQEAgc3RhdGljIGludCBzNXBfanBlZ19y ZW1vdmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAl2NGwyX2RldmljZV91bnJlZ2lz dGVyKCZqcGVnLT52NGwyX2Rldik7CiAKIAlpZiAoIXBtX3J1bnRpbWVfc3RhdHVzX3N1c3BlbmRl ZCgmcGRldi0+ZGV2KSkgewotCQlmb3IgKGkgPSBqcGVnLT52YXJpYW50LT5udW1fY2xvY2tzIC0g MTsgaSA+PSAwOyBpLS0pCi0JCQljbGtfZGlzYWJsZV91bnByZXBhcmUoanBlZy0+Y2xvY2tzW2ld KTsKKwkJY2xrX2J1bGtfZGlzYWJsZV91bnByZXBhcmUoanBlZy0+dmFyaWFudC0+bnVtX2Nsb2Nr cywKKwkJCQkJICAganBlZy0+Y2xvY2tzKTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTMwNjksMTAg KzMwNjksOCBAQCBzdGF0aWMgaW50IHM1cF9qcGVnX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2 aWNlICpwZGV2KQogc3RhdGljIGludCBzNXBfanBlZ19ydW50aW1lX3N1c3BlbmQoc3RydWN0IGRl dmljZSAqZGV2KQogewogCXN0cnVjdCBzNXBfanBlZyAqanBlZyA9IGRldl9nZXRfZHJ2ZGF0YShk ZXYpOwotCWludCBpOwogCi0JZm9yIChpID0ganBlZy0+dmFyaWFudC0+bnVtX2Nsb2NrcyAtIDE7 IGkgPj0gMDsgaS0tKQotCQljbGtfZGlzYWJsZV91bnByZXBhcmUoanBlZy0+Y2xvY2tzW2ldKTsK KwljbGtfYnVsa19kaXNhYmxlX3VucHJlcGFyZShqcGVnLT52YXJpYW50LT5udW1fY2xvY2tzLCBq cGVnLT5jbG9ja3MpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0zMDgxLDE2ICszMDc5LDExIEBAIHN0 YXRpYyBpbnQgczVwX2pwZWdfcnVudGltZV9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQogewog CXN0cnVjdCBzNXBfanBlZyAqanBlZyA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwogCXVuc2lnbmVk IGxvbmcgZmxhZ3M7Ci0JaW50IGksIHJldDsKLQotCWZvciAoaSA9IDA7IGkgPCBqcGVnLT52YXJp YW50LT5udW1fY2xvY2tzOyBpKyspIHsKLQkJcmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKGpwZWct PmNsb2Nrc1tpXSk7Ci0JCWlmIChyZXQpIHsKLQkJCXdoaWxlICgtLWkgPj0gMCkKLQkJCQljbGtf ZGlzYWJsZV91bnByZXBhcmUoanBlZy0+Y2xvY2tzW2ldKTsKLQkJCXJldHVybiByZXQ7Ci0JCX0K LQl9CisJaW50IHJldDsKKworCXJldCA9IGNsa19idWxrX3ByZXBhcmVfZW5hYmxlKGpwZWctPnZh cmlhbnQtPm51bV9jbG9ja3MsIGpwZWctPmNsb2Nrcyk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJl dDsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZqcGVnLT5zbG9jaywgZmxhZ3MpOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL3M1cC1qcGVnL2pwZWctY29yZS5oIGIvZHJpdmVy cy9tZWRpYS9wbGF0Zm9ybS9zNXAtanBlZy9qcGVnLWNvcmUuaAppbmRleCBhNDY0NjVlLi5kYzZl ZDk4IDEwMDY0NAotLS0gYS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL3M1cC1qcGVnL2pwZWctY29y ZS5oCisrKyBiL2RyaXZlcnMvbWVkaWEvcGxhdGZvcm0vczVwLWpwZWcvanBlZy1jb3JlLmgKQEAg LTEzMyw3ICsxMzMsNyBAQCBzdHJ1Y3QgczVwX2pwZWcgewogCXZvaWQgX19pb21lbQkJKnJlZ3M7 CiAJdW5zaWduZWQgaW50CQlpcnE7CiAJZW51bSBleHlub3M0X2pwZWdfcmVzdWx0IGlycV9yZXQ7 Ci0Jc3RydWN0IGNsawkJKmNsb2Nrc1tKUEVHX01BWF9DTE9DS1NdOworCXN0cnVjdCBjbGtfYnVs a19kYXRhCSpjbG9ja3M7CiAJc3RydWN0IGRldmljZQkJKmRldjsKIAlzdHJ1Y3QgczVwX2pwZWdf dmFyaWFudCAqdmFyaWFudDsKIAl1MzIJCQlpcnFfc3RhdHVzOwotLSAKMi43LjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: m.purski@samsung.com (Maciej Purski) Date: Mon, 19 Feb 2018 16:44:00 +0100 Subject: [PATCH 2/8] media: s5p-jpeg: Use bulk clk 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-3-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/media/platform/s5p-jpeg/jpeg-core.c | 45 ++++++++++++----------------- drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 +- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 79b63da..681a515 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -2903,7 +2903,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev) { struct s5p_jpeg *jpeg; struct resource *res; - int i, ret; + int ret; /* JPEG IP abstraction struct */ jpeg = devm_kzalloc(&pdev->dev, sizeof(struct s5p_jpeg), GFP_KERNEL); @@ -2938,15 +2938,16 @@ static int s5p_jpeg_probe(struct platform_device *pdev) } /* clocks */ - for (i = 0; i < jpeg->variant->num_clocks; i++) { - jpeg->clocks[i] = devm_clk_get(&pdev->dev, - jpeg->variant->clk_names[i]); - if (IS_ERR(jpeg->clocks[i])) { - dev_err(&pdev->dev, "failed to get clock: %s\n", - jpeg->variant->clk_names[i]); - return PTR_ERR(jpeg->clocks[i]); - } - } + jpeg->clocks = devm_clk_bulk_alloc(&pdev->dev, + jpeg->variant->num_clocks, + jpeg->variant->clk_names); + if (IS_ERR(jpeg->clocks)) + return PTR_ERR(jpeg->clocks); + + ret = devm_clk_bulk_get(&pdev->dev, jpeg->variant->num_clocks, + jpeg->clocks); + if (ret < 0) + return ret; /* v4l2 device */ ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev); @@ -3047,7 +3048,6 @@ static int s5p_jpeg_probe(struct platform_device *pdev) static int s5p_jpeg_remove(struct platform_device *pdev) { struct s5p_jpeg *jpeg = platform_get_drvdata(pdev); - int i; pm_runtime_disable(jpeg->dev); @@ -3058,8 +3058,8 @@ static int s5p_jpeg_remove(struct platform_device *pdev) v4l2_device_unregister(&jpeg->v4l2_dev); if (!pm_runtime_status_suspended(&pdev->dev)) { - for (i = jpeg->variant->num_clocks - 1; i >= 0; i--) - clk_disable_unprepare(jpeg->clocks[i]); + clk_bulk_disable_unprepare(jpeg->variant->num_clocks, + jpeg->clocks); } return 0; @@ -3069,10 +3069,8 @@ static int s5p_jpeg_remove(struct platform_device *pdev) static int s5p_jpeg_runtime_suspend(struct device *dev) { struct s5p_jpeg *jpeg = dev_get_drvdata(dev); - int i; - for (i = jpeg->variant->num_clocks - 1; i >= 0; i--) - clk_disable_unprepare(jpeg->clocks[i]); + clk_bulk_disable_unprepare(jpeg->variant->num_clocks, jpeg->clocks); return 0; } @@ -3081,16 +3079,11 @@ static int s5p_jpeg_runtime_resume(struct device *dev) { struct s5p_jpeg *jpeg = dev_get_drvdata(dev); unsigned long flags; - int i, ret; - - for (i = 0; i < jpeg->variant->num_clocks; i++) { - ret = clk_prepare_enable(jpeg->clocks[i]); - if (ret) { - while (--i >= 0) - clk_disable_unprepare(jpeg->clocks[i]); - return ret; - } - } + int ret; + + ret = clk_bulk_prepare_enable(jpeg->variant->num_clocks, jpeg->clocks); + if (ret) + return ret; spin_lock_irqsave(&jpeg->slock, flags); diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/s5p-jpeg/jpeg-core.h index a46465e..dc6ed98 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.h @@ -133,7 +133,7 @@ struct s5p_jpeg { void __iomem *regs; unsigned int irq; enum exynos4_jpeg_result irq_ret; - struct clk *clocks[JPEG_MAX_CLOCKS]; + struct clk_bulk_data *clocks; struct device *dev; struct s5p_jpeg_variant *variant; u32 irq_status; -- 2.7.4