From patchwork Mon Mar 20 10:56:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9633815 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 06FEF601E9 for ; Mon, 20 Mar 2017 11:03:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF39E275A2 for ; Mon, 20 Mar 2017 11:03:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E419027FA3; Mon, 20 Mar 2017 11:03:27 +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=unavailable 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 C0C0027FAE for ; Mon, 20 Mar 2017 11:03:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753071AbdCTLAy (ORCPT ); Mon, 20 Mar 2017 07:00:54 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:32748 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753339AbdCTK5J (ORCPT ); Mon, 20 Mar 2017 06:57:09 -0400 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 <0ON400BGL12Q9W20@mailout4.w1.samsung.com>; Mon, 20 Mar 2017 10:56:50 +0000 (GMT) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170320105649eucas1p2d476e69df7031dcb3928588ae3b2cb83~tkdhLsqys2732527325eucas1p2r; Mon, 20 Mar 2017 10:56:49 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 27.FF.09557.175BFC85; Mon, 20 Mar 2017 10:56:49 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170320105649eucas1p111bb7137d958831701debe9704844017~tkdgjtuXX0560605606eucas1p1Z; Mon, 20 Mar 2017 10:56:49 +0000 (GMT) X-AuditID: cbfec7f2-f790f6d000002555-77-58cfb5718811 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id FB.DA.10233.F75BFC85; Mon, 20 Mar 2017 10:57:03 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ON4005OP12KYT20@eusync4.samsung.com>; Mon, 20 Mar 2017 10:56:48 +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 v3 01/16] media: s5p-mfc: Remove unused structures and dead code Date: Mon, 20 Mar 2017 11:56:27 +0100 Message-id: <1490007402-30265-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1490007402-30265-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMIsWRmVeSWpSXmKPExsWy7djP87qFW89HGCzaqWZxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDmKyyYl NSezLLVI3y6BK2PmoSdMBQ9UK07c6GdpYDwl38XIwSEhYCJxZVV0FyMnkCkmceHeerYuRi4O IYGljBLNXz4zQjifGSXWbL3DBlFlInG/5xwrRGIZo8S1fVegWhqYJB697GYEqWITMJToetsF 1iEi4CSxcNZfdpAiZoHvjBLfdp9mBdktLBAkcfNMGEgNi4CqRO+z+0wgNq+Ah8TKzx/YIbbJ SZw8NpkVxOYU8JR4cf0v2DIJgedsEjPXrWOH+EFWYtMBZoh6F4l3r9qgbGGJV8e3QM2Rkbg8 uZsFwu5nlGhq1YawZzBKnHvLC2FbSxw+fhFsF7MAn8SkbdOZIcbzSnS0CUGUeEjcfr6RCcJ2 lLi6ZwETxO9zGCUObvzENIFRZgEjwypGkdTS4tz01GJjveLE3OLSvHS95PzcTYzAqD397/in HYxfT1gdYhTgYFTi4b1x6VyEEGtiWXFl7iFGCQ5mJRHej3PPRwjxpiRWVqUW5ccXleakFh9i lOZgURLn3bPgSriQQHpiSWp2ampBahFMlomDU6qB0UGuXTNycv0fLy62XZOKj9/ja3mzf7Oy +bs73C/2XLu/WGnvd8e9PydUPNiT6N0R9lhKzPLvs5Nnqq49XLlMaIZDSKzdx9qtN783/nXk KO/Y+7q19v8/LUX2qqfJr78+2c772W/CnTXLpn2qjf24NKmcV/ecXHJooNzXdapFs39H3rTe 0MN4oEiJpTgj0VCLuag4EQCAwGqG1gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRmVeSWpSXmKPExsVy+t/xa7r1W89HGDx4r2Vxa905VotJ9yew WJw/v4HdomfDVlaLGef3MVmsPXKX3eLwm3Ygd/JLNgcOj02rOtk8+rasYvT4vEkugDnKzSYj NTEltUghNS85PyUzL91WKTTETddCSSEvMTfVVilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJ bhkzDz1hKnigWnHiRj9LA+Mp+S5GTg4JAROJ+z3nWCFsMYkL99azdTFycQgJLGGUuNs/hwXC aWKSWL/2KlgVm4ChRNfbLjYQW0TASWLhrL/sIDazwHdGiWU300BsYYEAia0NDcwgNouAqkTv s/tMIDavgIfEys8f2CG2yUmcPDYZbCangKfEi+t/wWYKAdWs+zyRaQIj7wJGhlWMIqmlxbnp ucVGesWJucWleel6yfm5mxiBIbzt2M8tOxi73gUfYhTgYFTi4TW4ei5CiDWxrLgy9xCjBAez kgjvx7nnI4R4UxIrq1KL8uOLSnNSiw8xmgIdNZFZSjQ5HxhfeSXxhiaG5paGRsYWFuZGRkri vFM/XAkXEkhPLEnNTk0tSC2C6WPi4JRqYKxofJhg28t2ZrdLH/OpAOZoIVPeH7wW7RnnJjSU rDrb/nTPVO3WTf15N6v+nurQy8i505pcp5u9o8tRtXWNwqwdpcfYHva8D5xbwNTVmG889xV/ ccy9+9eEJOVXMdx/prVrDbvG9VXektIxl27Zf/nT1vrV+HTZ+8pZuc/rCpjPCrK+/a28TIml OCPRUIu5qDgRAOh79j53AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170320105649eucas1p111bb7137d958831701debe9704844017 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: 20170320105649eucas1p111bb7137d958831701debe9704844017 X-RootMTR: 20170320105649eucas1p111bb7137d958831701debe9704844017 References: <1490007402-30265-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 b99a7d0466a8..4e9f349c1be3 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1417,16 +1417,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, @@ -1447,16 +1442,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 @@ -1481,16 +1471,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, @@ -1510,16 +1495,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, @@ -1530,7 +1510,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);