[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>

diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 98edf46b22d08ccc13f9c298f8113edaeafd7ea2..cdb7048874c5a0641748d213bb1a07cc023d81c3 100644 (file)
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -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) ||
-                (delsys == SYS_DVBS) || (delsys == SYS_ATSC);
-
-       return status;
+       return (delsys == SYS_DVBT) || (delsys == SYS_DVBC_ANNEX_A) ||
+              (delsys == SYS_DVBS) || (delsys == SYS_ATSC);
 }
 
 /**

diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 11d81389ab1e5034f44e50ab26029f54afb4b4b2..e825bc93ea7a9f72d73c00410b6fb20e8c2c43d5 100644 (file)
--- 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 fbcc2e5c94146717e6a46485ec978dafc593c53f..37e7e6684e3ccbe613c2113ede347831ef314b77 100644 (file)
--- 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);
 }
 
 

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
index 0912d0a892e2cd9e90bfd1a465b58439a12a9416..a1d823ab0c63ce28581dbb9c4d8c6b464a1c395f 100644 (file)
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
@@ -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)

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 44323cb5d287578e8353f7ae89c21ae2ff7eb829..b2d166b2221abfd21554d01472fddf791a24fac2 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -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)

diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
index bd7b3bdb1a884566786aa31276121547ed244bd2..ecab69ea3d5157d3ef6bce57a742fa7d01d81073 100644 (file)
--- a/drivers/media/rc/fintek-cir.c
+++ b/drivers/media/rc/fintek-cir.c
@@ -104,11 +104,7 @@ static inline void fintek_cir_reg_write(struct fintek_dev *fintek, u8 val, u8 of
 /* read val from cir config register */
 static u8 fintek_cir_reg_read(struct fintek_dev *fintek, u8 offset)
 {
-       u8 val;
-
-       val = inb(fintek->cir_addr + offset);
-
-       return val;
+       return inb(fintek->cir_addr + offset);
 }
 
 /* dump current cir register contents */

diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index 0e8fb89896c40ee26b02df2db275a64a85cbe866..5fea02672685b41cf46f0eb31c67b7fc763c0fde 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -156,21 +156,19 @@ struct lme2510_state {
 static int lme2510_bulk_write(struct usb_device *dev,
                                u8 *snd, int len, u8 pipe)
 {
-       int ret, actual_l;
+       int actual_l;
 
-       ret = usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe),
-                               snd, len , &actual_l, 100);
-       return ret;
+       return usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe),
+                           snd, len, &actual_l, 100);
 }
 
 static int lme2510_bulk_read(struct usb_device *dev,
                                u8 *rev, int len, u8 pipe)
 {
-       int ret, actual_l;
+       int actual_l;
 
-       ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe),
-                                rev, len , &actual_l, 200);
-       return ret;
+       return usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe),
+                           rev, len, &actual_l, 200);
 }
 
 static int lme2510_usb_talk(struct dvb_usb_device *d,

diff --git a/drivers/media/usb/dvb-usb/m920x.c b/drivers/media/usb/dvb-usb/m920x.c
index eafc5c82467f4e77bedb29992fe4a6cb9845423d..70672e1e5ec7d56569c10aa97247a6b009a1bcbd 100644 (file)
--- a/drivers/media/usb/dvb-usb/m920x.c
+++ b/drivers/media/usb/dvb-usb/m920x.c
@@ -55,13 +55,9 @@ static inline int m920x_read(struct usb_device *udev, u8 request, u16 value,
 static inline int m920x_write(struct usb_device *udev, u8 request,
                              u16 value, u16 index)
 {
-       int ret;
-
-       ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                             request, USB_TYPE_VENDOR | USB_DIR_OUT,
-                             value, index, NULL, 0, 2000);
-
-       return ret;
+       return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), request,
+                              USB_TYPE_VENDOR | USB_DIR_OUT, value, index,
+                              NULL, 0, 2000);
 }
 
 static inline int m920x_write_seq(struct usb_device *udev, u8 request,

diff --git a/drivers/media/usb/gspca/jl2005bcd.c b/drivers/media/usb/gspca/jl2005bcd.c
index ac295f04bd18427faccfa9287826741593e655b2..b12ecb72df4cf4e0e0980ee95c8704805c886c42 100644 (file)
--- a/drivers/media/usb/gspca/jl2005bcd.c
+++ b/drivers/media/usb/gspca/jl2005bcd.c
@@ -299,10 +299,7 @@ static int jl2005c_stream_start_cif_small(struct gspca_dev *gspca_dev)
 
 static int jl2005c_stop(struct gspca_dev *gspca_dev)
 {
-       int retval;
-
-       retval = jl2005c_write_reg(gspca_dev, 0x07, 0x00);
-       return retval;
+       return jl2005c_write_reg(gspca_dev, 0x07, 0x00);
 }
 
 /*

diff --git a/drivers/media/usb/gspca/sq905c.c b/drivers/media/usb/gspca/sq905c.c
index e02b8c1d06a208e7f456b89b388e5c6840233d2d..6c45dcc44eb01fd37fe21a178d20301dfc0e673e 100644 (file)
--- a/drivers/media/usb/gspca/sq905c.c
+++ b/drivers/media/usb/gspca/sq905c.c
@@ -257,11 +257,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
-       int ret;
-
        /* connect to the camera and reset it. */
-       ret = sq905c_command(gspca_dev, SQ905C_CLEAR, 0);
-       return ret;
+       return sq905c_command(gspca_dev, SQ905C_CLEAR, 0);
 }
 
 /* Set up for getting frames. */