Commit 9f05df83 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Remove unused structures and dead code 



Remove unused structures, definitions and functions
that are no longer called from the driver code.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Tested-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Tested-by: default avatarSmitha T Murthy <smitha.t@samsung.com>
Reviewed-by: default avatarSmitha T Murthy <smitha.t@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 0c32b8ec

drivers/media/platform/s5p-mfc/s5p_mfc.c

+0 −21
Original line number Diff line number Diff line
@@ -1417,16 +1417,11 @@ static struct s5p_mfc_buf_size buf_size_v5 = { 
	.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 struct s5p_mfc_buf_size buf_size_v6 = { 
	.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 struct s5p_mfc_buf_size buf_size_v7 = { 
	.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 struct s5p_mfc_buf_size buf_size_v8 = { 
	.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 struct s5p_mfc_variant mfc_drvdata_v8_5433 = { 
	.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,

drivers/media/platform/s5p-mfc/s5p_mfc_common.h

+0 −13
Original line number Diff line number Diff line
@@ -44,14 +44,6 @@ 


#include <media/videobuf2-dma-contig.h>



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;

drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h

+0 −1
Original line number Diff line number Diff line
@@ -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);