Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a8d979 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Mauro Carvalho Chehab
Browse files

[media] squash lines for simple wrapper functions 



Remove unneeded variables and assignments.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 4a322983

drivers/media/dvb-core/dvb_frontend.c

+2 −6
Original line number Diff line number Diff line
@@ -1520,12 +1520,8 @@ static int dtv_set_frontend(struct dvb_frontend *fe); 


static bool is_dvbv3_delsys(u32 delsys)

{

	bool status;



	status = (delsys == SYS_DVBT) || (delsys == SYS_DVBC_ANNEX_A) ||

	return (delsys == SYS_DVBT) || (delsys == SYS_DVBC_ANNEX_A) ||

	       (delsys == SYS_DVBS) || (delsys == SYS_ATSC);



	return status;

}



/**

drivers/media/pci/meye/meye.c

+1 −4
Original line number Diff line number Diff line
@@ -586,10 +586,7 @@ static void mchip_hic_stop(void) 
/* get the next ready frame from the dma engine */

static u32 mchip_get_frame(void)

{

	u32 v;



	v = mchip_read(MCHIP_MM_FIR(meye.mchip_fnum));

	return v;

	return mchip_read(MCHIP_MM_FIR(meye.mchip_fnum));

}



/* frees the current frame from the dma engine */

drivers/media/pci/ttpci/av7110.c

+1 −3
Original line number Diff line number Diff line
@@ -2925,9 +2925,7 @@ static struct saa7146_extension av7110_extension_driver = { 


static int __init av7110_init(void)

{

	int retval;

	retval = saa7146_register_extension(&av7110_extension_driver);

	return retval;

	return saa7146_register_extension(&av7110_extension_driver);

}

drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c

+3 −14
Original line number Diff line number Diff line
@@ -178,20 +178,12 @@ void exynos4_jpeg_set_interrupt(void __iomem *base, unsigned int version) 


unsigned int exynos4_jpeg_get_int_status(void __iomem *base)

{

	unsigned int	int_status;



	int_status = readl(base + EXYNOS4_INT_STATUS_REG);



	return int_status;

	return readl(base + EXYNOS4_INT_STATUS_REG);

}



unsigned int exynos4_jpeg_get_fifo_status(void __iomem *base)

{

	unsigned int fifo_status;



	fifo_status = readl(base + EXYNOS4_FIFO_STATUS_REG);



	return fifo_status;

	return readl(base + EXYNOS4_FIFO_STATUS_REG);

}



void exynos4_jpeg_set_huf_table_enable(void __iomem *base, int value)
@@ -296,10 +288,7 @@ void exynos4_jpeg_set_encode_hoff_cnt(void __iomem *base, unsigned int fmt) 


unsigned int exynos4_jpeg_get_stream_size(void __iomem *base)

{

	unsigned int size;



	size = readl(base + EXYNOS4_BITSTREAM_SIZE_REG);

	return size;

	return readl(base + EXYNOS4_BITSTREAM_SIZE_REG);

}



void exynos4_jpeg_set_dec_bitstream_size(void __iomem *base, unsigned int size)

drivers/media/platform/ti-vpe/cal.c

+1 −5
Original line number Diff line number Diff line
@@ -483,11 +483,7 @@ static void cal_get_hwinfo(struct cal_dev *dev) 


static inline int cal_runtime_get(struct cal_dev *dev)

{

	int r;



	r = pm_runtime_get_sync(&dev->pdev->dev);



	return r;

	return pm_runtime_get_sync(&dev->pdev->dev);

}



static inline void cal_runtime_put(struct cal_dev *dev)