From patchwork Tue Feb 14 07:51:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9571383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 153B66045F for ; Tue, 14 Feb 2017 07:52:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0701F26E94 for ; Tue, 14 Feb 2017 07:52:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F006C2838E; Tue, 14 Feb 2017 07:52:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 880F526E94 for ; Tue, 14 Feb 2017 07:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752587AbdBNHwY (ORCPT ); Tue, 14 Feb 2017 02:52:24 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:39761 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750930AbdBNHwU (ORCPT ); Tue, 14 Feb 2017 02:52:20 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OLC003K6TV4BA20@mailout3.w1.samsung.com>; Tue, 14 Feb 2017 07:52:16 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170214075215eucas1p1bba8b7298a1b3bb70255a4816874ed04~jGAqlf9aS2143621436eucas1p1x; Tue, 14 Feb 2017 07:52:15 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id E3.84.09557.F27B2A85; Tue, 14 Feb 2017 07:52:15 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170214075215eucas1p1e77dbae8e0be9f7f5bf66765c5d57f5f~jGApz9PY32143621436eucas1p1w; Tue, 14 Feb 2017 07:52:15 +0000 (GMT) X-AuditID: cbfec7f2-f790f6d000002555-b0-58a2b72fa432 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id EB.5E.06687.E77B2A85; Tue, 14 Feb 2017 07:53:34 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OLC00FWGTUYP980@eusync2.samsung.com>; Tue, 14 Feb 2017 07:52:15 +0000 (GMT) From: Marek Szyprowski To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Andrzej Hajda , Krzysztof Kozlowski , Inki Dae , Seung-Woo Kim Subject: [PATCH 02/15] media: s5p-mfc: Use generic of_device_get_match_data helper Date: Tue, 14 Feb 2017 08:51:55 +0100 Message-id: <1487058728-16501-3-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1487058728-16501-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsWy7djPc7r62xdFGLy9rGVxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDmKyyYl NSezLLVI3y6BK+Pl9l9MBbvFKp429bI3MPYJdzFyckgImEjcXbKADcIWk7hwbz2QzcUhJLCU UeL48R4mCOczo0TPy2nsMB1bGnawQySWMUo8P7KfGcJpYJK4cGAu2Cw2AUOJrrddYLaIgJPE wll/wTqYBb4zSnzbfZoVJCEsECIx414vmM0ioCqx4dNaFhCbV8BDYvXOxcwQ6+QkTh6bDFbD KeApsenzFEaQQRICz9kk9va8BHI4gBxZiU0HoOpdJL62HmOCsIUlXh3fAnW2jERnx0GoeD+j RFOrNoQ9g1Hi3FteCNta4vDxi2C7mAX4JCZtm84MMZ5XoqNNCKLEQ2L/rGvQ8HKUOL3pDdha IYE5jBJr7ylOYJRZwMiwilEktbQ4Nz212FivODG3uDQvXS85P3cTIzBuT/87/mkH49cTVocY BTgYlXh4JxxYGCHEmlhWXJl7iFGCg1lJhJehd1GEEG9KYmVValF+fFFpTmrxIUZpDhYlcd49 C66ECwmkJ5akZqemFqQWwWSZODilGhhPTZT8ZXcr8eMeU6atun7amyUCVzqpKGpxWG5QnxrP oyrKf2vf6Yw5b1mWtJoJPhIzzncObt9avy9vCv/mkxF9Mpv3FRpGGe24+YFXRL3PJ2xS7qGQ rxtZT6x75zPhaUX5spnal89uzN3jGvbnxK2WNLf+D5feulnPaTt7KGdG0YloYaXymPtKLMUZ iYZazEXFiQDLvHt/1wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRmVeSWpSXmKPExsVy+t/xK7p12xdFGGxbzmlxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDnKzSYj NTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJ bhkvt/9iKtgtVvG0qZe9gbFPuIuRk0NCwERiS8MOdghbTOLCvfVsXYxcHEICSxglvjX/ZoFw mpgkZt+ZyAhSxSZgKNH1tosNxBYRcJJYOOsvWDezwHdGiWU300BsYYEQiRn3ellBbBYBVYkN n9aygNi8Ah4Sq3cuZobYJidx8thksBpOAU+JTZ+ngM0XAqo5u2YH+wRG3gWMDKsYRVJLi3PT c4sN9YoTc4tL89L1kvNzNzECQ3jbsZ+bdzBe2hh8iFGAg1GJh3fCgYURQqyJZcWVuYcYJTiY lUR4GXoXRQjxpiRWVqUW5ccXleakFh9iNAU6aiKzlGhyPjC+8kriDU0MzS0NjYwtLMyNjJTE eUs+XAkXEkhPLEnNTk0tSC2C6WPi4JRqYJycxyXlUWr6esL2mzmBiiEaxYlZN3amt0rcM3qz 7GOl2btIq66+C1zyKx1uGnS90/ng//7tgrN3zlqfqZC8mvlo+6lknbiamYfXX6tPLX6Y227Y 2bHhoOTNsJu37sZuubpuHTC4jz60Pd9eJC4V7Dcrfb2FRRRf+g2PcItCx4PpuX+e7Xy4TIml OCPRUIu5qDgRALMv4+J3AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170214075215eucas1p1e77dbae8e0be9f7f5bf66765c5d57f5f X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170214075215eucas1p1e77dbae8e0be9f7f5bf66765c5d57f5f X-RootMTR: 20170214075215eucas1p1e77dbae8e0be9f7f5bf66765c5d57f5f References: <1487058728-16501-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace custom code with generic helper to retrieve driver data. Signed-off-by: Marek Szyprowski Reviewed-by: Javier Martinez Canillas Tested-by: Javier Martinez Canillas --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 17 ++--------------- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 ++-- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 3e1f22eb4339..ad3d7377f40d 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "s5p_mfc_common.h" @@ -1157,8 +1158,6 @@ static void s5p_mfc_unconfigure_dma_memory(struct s5p_mfc_dev *mfc_dev) device_unregister(mfc_dev->mem_dev_r); } -static void *mfc_get_drv_data(struct platform_device *pdev); - /* MFC probe function */ static int s5p_mfc_probe(struct platform_device *pdev) { @@ -1182,7 +1181,7 @@ static int s5p_mfc_probe(struct platform_device *pdev) return -ENODEV; } - dev->variant = mfc_get_drv_data(pdev); + dev->variant = of_device_get_match_data(&pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); dev->regs_base = devm_ioremap_resource(&pdev->dev, res); @@ -1541,18 +1540,6 @@ static int s5p_mfc_resume(struct device *dev) }; MODULE_DEVICE_TABLE(of, exynos_mfc_match); -static void *mfc_get_drv_data(struct platform_device *pdev) -{ - struct s5p_mfc_variant *driver_data = NULL; - const struct of_device_id *match; - - match = of_match_node(exynos_mfc_match, pdev->dev.of_node); - if (match) - driver_data = (struct s5p_mfc_variant *)match->data; - - return driver_data; -} - static struct platform_driver s5p_mfc_driver = { .probe = s5p_mfc_probe, .remove = s5p_mfc_remove, diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index 3e0e8eaf8bfe..2f1387a4c386 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -192,7 +192,7 @@ struct s5p_mfc_buf { */ struct s5p_mfc_pm { struct clk *clock_gate; - const char **clk_names; + const char * const *clk_names; struct clk *clocks[MFC_MAX_CLOCKS]; int num_clocks; bool use_clock_gating; @@ -304,7 +304,7 @@ struct s5p_mfc_dev { struct v4l2_ctrl_handler dec_ctrl_handler; struct v4l2_ctrl_handler enc_ctrl_handler; struct s5p_mfc_pm pm; - struct s5p_mfc_variant *variant; + const struct s5p_mfc_variant *variant; int num_inst; spinlock_t irqlock; /* lock when operating on context */ spinlock_t condlock; /* lock when changing/checking if a context is