summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorMasahiro Yamada2016-09-07 00:52:24 +0200
committerMauro Carvalho Chehab2016-11-16 16:28:40 +0100
commit29a8d9792514557e26a9b05deaf671f2d83fa8ec (patch)
treefbdbb0fb4487cbe5b648555f6c2db076d3313315 /drivers/media/pci
parent[media] s5p-cec: remove unused including <linux/version.h> (diff)
downloadkernel-qcow2-linux-29a8d9792514557e26a9b05deaf671f2d83fa8ec.tar.gz
kernel-qcow2-linux-29a8d9792514557e26a9b05deaf671f2d83fa8ec.tar.xz
kernel-qcow2-linux-29a8d9792514557e26a9b05deaf671f2d83fa8ec.zip
[media] squash lines for simple wrapper functions
Remove unneeded variables and assignments. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/meye/meye.c5
-rw-r--r--drivers/media/pci/ttpci/av7110.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 11d81389ab1e..e825bc93ea7a 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -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 */
diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c
index fbcc2e5c9414..37e7e6684e3c 100644
--- a/drivers/media/pci/ttpci/av7110.c
+++ b/drivers/media/pci/ttpci/av7110.c
@@ -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);
}