From patchwork Mon Feb 20 13:38:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9582825 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 67BE36042F for ; Mon, 20 Feb 2017 13:39:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59B9A2886E for ; Mon, 20 Feb 2017 13:39:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D50628877; Mon, 20 Feb 2017 13:39:19 +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 3ED5C2886E for ; Mon, 20 Feb 2017 13:39:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752691AbdBTNjR (ORCPT ); Mon, 20 Feb 2017 08:39:17 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:23438 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752513AbdBTNjP (ORCPT ); Mon, 20 Feb 2017 08:39:15 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OLO009UXDXCVM40@mailout4.w1.samsung.com>; Mon, 20 Feb 2017 13:39:12 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170220133912eucas1p2a1746c22a41f13f7a54854c4cc7fdcdd~lAnSsU-0C0831408314eucas1p2G; Mon, 20 Feb 2017 13:39:12 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 89.12.28517.F71FAA85; Mon, 20 Feb 2017 13:39:11 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170220133911eucas1p257b33c37da51473580724d4e8b1392fa~lAnSGOsuC0821808218eucas1p2q; Mon, 20 Feb 2017 13:39:11 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-72-58aaf17fe47f Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id F1.FA.10233.481FAA85; Mon, 20 Feb 2017 13:39:16 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OLO00HBFDX6PK30@eusync1.samsung.com>; Mon, 20 Feb 2017 13:39:11 +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 v2 01/15] media: s5p-mfc: Remove unused structures and dead code Date: Mon, 20 Feb 2017 14:38:50 +0100 Message-id: <1487597944-2000-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1487597944-2000-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsWy7djP87r1H1dFGHRMNLC4te4cq8Wk+xNY LM6f38Bu0bNhK6vFjPP7mCzWHrnLbnH4TTuQO/klmwOHx6ZVnWwefVtWMXp83iQXwBzFZZOS mpNZllqkb5fAlbF80wnmgpMqFQ1H3rE2MB6R62Lk5JAQMJF4v/sJE4QtJnHh3nq2LkYuDiGB pYwS3beeskI4nxklel5vZILpuD/zA1TVMqCqn9+ZIJwGJom70y4yglSxCRhKdL3tYgOxRQSc JBbO+ssOUsQs8J1R4tvu06wgCWGBIIlvzReZQWwWAVWJ62ungK3gFXCXmDjrB9Q6OYmTxyYD 1XNwcAp4SOxoTwaZIyHwmk2i6csysLiEgKzEpgPMEOUuEk8enmKDsIUlXh3fwg5hy0hcntzN AmH3M0o0tWpD2DMYJc695YWwrSUOH78IdhqzAJ/EpG3TmSHG80p0tAlBlHhIvJh6gRXCdpRo +3+cBeL32YwSH1c0skxglFnAyLCKUSS1tDg3PbXYRK84Mbe4NC9dLzk/dxMjMG5P/zv+ZQfj 4mNWhxgFOBiVeHg1Zq6MEGJNLCuuzD3EKMHBrCTCe/nlqggh3pTEyqrUovz4otKc1OJDjNIc LErivHsWXAkXEkhPLEnNTk0tSC2CyTJxcEo1MArVCCkGRU12fMZhsa7nvUVV3Q+mT182P55c qvR+QeK8/7Zirzj2PpTWtt834+4R8Qy3u6UiS9a2L7O2af6651Lgvl/fpNXYfFR+cJrvav76 oSBToHGx57+z6uyNWauYBFbJn7pc9PrX43n+S4+XcU5XXXXvxQF/Y/8NdcsSdFdXTFu2e4Ns +B0lluKMREMt5qLiRAAPKa1n1wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsVy+t/xy7otH1dFGHR/NbS4te4cq8Wk+xNY LM6f38Bu0bNhK6vFjPP7mCzWHrnLbnH4TTuQO/klmwOHx6ZVnWwefVtWMXp83iQXwBzlZpOR mpiSWqSQmpecn5KZl26rFBripmuhpJCXmJtqqxSh6xsSpKRQlphTCuQZGaABB+cA92AlfbsE t4zlm04wF5xUqWg48o61gfGIXBcjJ4eEgInE/Zkf2CBsMYkL99YD2VwcQgJLGCV+rLjKCuE0 MUks2X+CFaSKTcBQouttF1iHiICTxMJZf9lBbGaB74wSy26mgdjCAgESs99NYwSxWQRUJa6v ncIEYvMKuEtMnPWDCWKbnMTJY5OBZnJwcAp4SOxoTwYJCwGVfHnWyzSBkXcBI8MqRpHU0uLc 9NxiI73ixNzi0rx0veT83E2MwADeduznlh2MXe+CDzEKcDAq8fBqzFwZIcSaWFZcmXuIUYKD WUmE9/LLVRFCvCmJlVWpRfnxRaU5qcWHGE2BbprILCWanA+MrrySeEMTQ3NLQyNjCwtzIyMl cd6pH66ECwmkJ5akZqemFqQWwfQxcXBKNTAe3fIwLce/eNVkh6j8P//STxmfz5KIinhZFH/o 2fSLjivl522bc8j169H5Ez+kxJ26Zr5zh/ZuKza1yyaBla5/Jvhnc4mYbWW/HO0yuc3xDN8t Tb+63JVXFv04ltoRwd779jh/s1Z2b0Ebt+Kcup6GQ7XPXhgu/hDJ80KirIkjItt9u05ibYkS S3FGoqEWc1FxIgAmmAQadgIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170220133911eucas1p257b33c37da51473580724d4e8b1392fa X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 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: 20170220133911eucas1p257b33c37da51473580724d4e8b1392fa X-RootMTR: 20170220133911eucas1p257b33c37da51473580724d4e8b1392fa References: <1487597944-2000-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 Remove unused structures, definitions and functions that are no longer called from the driver code. Signed-off-by: Marek Szyprowski Reviewed-by: Javier Martinez Canillas Tested-by: Javier Martinez Canillas Acked-by: Andrzej Hajda Tested-by: Smitha T Murthy Reviewed-by: Smitha T Murthy --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 21 --------------------- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 13 ------------- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 1 - 3 files changed, 35 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 05fe82be6584..3e1f22eb4339 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1422,16 +1422,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v5, }; -static struct s5p_mfc_buf_align mfc_buf_align_v5 = { - .base = MFC_BASE_ALIGN_ORDER, -}; - static struct s5p_mfc_variant mfc_drvdata_v5 = { .version = MFC_VERSION, .version_bit = MFC_V5_BIT, .port_num = MFC_NUM_PORTS, .buf_size = &buf_size_v5, - .buf_align = &mfc_buf_align_v5, .fw_name[0] = "s5p-mfc.fw", .clk_names = {"mfc", "sclk_mfc"}, .num_clocks = 2, @@ -1452,16 +1447,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v6, }; -static struct s5p_mfc_buf_align mfc_buf_align_v6 = { - .base = 0, -}; - static struct s5p_mfc_variant mfc_drvdata_v6 = { .version = MFC_VERSION_V6, .version_bit = MFC_V6_BIT, .port_num = MFC_NUM_PORTS_V6, .buf_size = &buf_size_v6, - .buf_align = &mfc_buf_align_v6, .fw_name[0] = "s5p-mfc-v6.fw", /* * v6-v2 firmware contains bug fixes and interface change @@ -1486,16 +1476,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v7, }; -static struct s5p_mfc_buf_align mfc_buf_align_v7 = { - .base = 0, -}; - static struct s5p_mfc_variant mfc_drvdata_v7 = { .version = MFC_VERSION_V7, .version_bit = MFC_V7_BIT, .port_num = MFC_NUM_PORTS_V7, .buf_size = &buf_size_v7, - .buf_align = &mfc_buf_align_v7, .fw_name[0] = "s5p-mfc-v7.fw", .clk_names = {"mfc", "sclk_mfc"}, .num_clocks = 2, @@ -1515,16 +1500,11 @@ static int s5p_mfc_resume(struct device *dev) .priv = &mfc_buf_size_v8, }; -static struct s5p_mfc_buf_align mfc_buf_align_v8 = { - .base = 0, -}; - static struct s5p_mfc_variant mfc_drvdata_v8 = { .version = MFC_VERSION_V8, .version_bit = MFC_V8_BIT, .port_num = MFC_NUM_PORTS_V8, .buf_size = &buf_size_v8, - .buf_align = &mfc_buf_align_v8, .fw_name[0] = "s5p-mfc-v8.fw", .clk_names = {"mfc"}, .num_clocks = 1, @@ -1535,7 +1515,6 @@ static int s5p_mfc_resume(struct device *dev) .version_bit = MFC_V8_BIT, .port_num = MFC_NUM_PORTS_V8, .buf_size = &buf_size_v8, - .buf_align = &mfc_buf_align_v8, .fw_name[0] = "s5p-mfc-v8.fw", .clk_names = {"pclk", "aclk", "aclk_xiu"}, .num_clocks = 3, diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index ab23236aa942..3e0e8eaf8bfe 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -44,14 +44,6 @@ #include -static inline dma_addr_t s5p_mfc_mem_cookie(void *a, void *b) -{ - /* Same functionality as the vb2_dma_contig_plane_paddr */ - dma_addr_t *paddr = vb2_dma_contig_memops.cookie(b); - - return *paddr; -} - /* MFC definitions */ #define MFC_MAX_EXTRA_DPB 5 #define MFC_MAX_BUFFERS 32 @@ -229,16 +221,11 @@ struct s5p_mfc_buf_size { void *priv; }; -struct s5p_mfc_buf_align { - unsigned int base; -}; - struct s5p_mfc_variant { unsigned int version; unsigned int port_num; u32 version_bit; struct s5p_mfc_buf_size *buf_size; - struct s5p_mfc_buf_align *buf_align; char *fw_name[MFC_FW_MAX_VERSIONS]; const char *clk_names[MFC_MAX_CLOCKS]; int num_clocks; diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h index 8e5df041edf7..45c807bf19cc 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h @@ -18,7 +18,6 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev); int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev); int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev); -int s5p_mfc_reload_firmware(struct s5p_mfc_dev *dev); int s5p_mfc_init_hw(struct s5p_mfc_dev *dev); void s5p_mfc_deinit_hw(struct s5p_mfc_dev *dev);