V4L/DVB (8686): mt9m111: style cleanup

Fix a typo in Kconfig, simplify error checking, further minor cleanup.

Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Guennadi Liakhovetski <g.iakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 6ebe9f1aca043045a3d2c98731433c7328326246..37123ff20fc5b8af05153e8b01286b6c69f87657 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -810,7 +810,7 @@ config MT9M001_PCA9536_SWITCH
          extender to switch between 8 and 10 bit datawidth modes
 
 config SOC_CAMERA_MT9M111
-       tristate "mt9m001 support"
+       tristate "mt9m111 support"
        depends on SOC_CAMERA && I2C
        help
          This driver supports MT9M111 cameras from Micron

diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 0c88e5d6dc44917070f2c3369ab4ce516df4e327..d99932631050c7bc378d8adba3b378d157b390e0 100644 (file)
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -173,7 +173,7 @@ static int reg_page_map_set(struct i2c_client *client, const u16 reg)
                return -EINVAL;
 
        ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page));
-       if (ret >= 0)
+       if (!ret)
                lastpage = page;
        return ret;
 }
@@ -200,7 +200,7 @@ static int mt9m111_reg_write(struct soc_camera_device *icd, const u16 reg,
        int ret;
 
        ret = reg_page_map_set(client, reg);
-       if (ret >= 0)
+       if (!ret)
                ret = i2c_smbus_write_word_data(mt9m111->client, (reg & 0xff),
                                                swab16(data));
        dev_dbg(&icd->dev, "write reg.%03x = %04x -> %d\n", reg, data, ret);
@@ -246,7 +246,7 @@ static int mt9m111_set_context(struct soc_camera_device *icd,
 static int mt9m111_setup_rect(struct soc_camera_device *icd)
 {
        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
-       int ret = 0, is_raw_format;
+       int ret, is_raw_format;
        int width = mt9m111->width;
        int height = mt9m111->height;
 
@@ -256,32 +256,31 @@ static int mt9m111_setup_rect(struct soc_camera_device *icd)
        else
                is_raw_format = 0;
 
-       if (ret >= 0)
-               ret = reg_write(COLUMN_START, mt9m111->left);
-       if (ret >= 0)
+       ret = reg_write(COLUMN_START, mt9m111->left);
+       if (!ret)
                ret = reg_write(ROW_START, mt9m111->top);
 
        if (is_raw_format) {
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(WINDOW_WIDTH, width);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(WINDOW_HEIGHT, height);
        } else {
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_XZOOM_B, MT9M111_MAX_WIDTH);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_YZOOM_B, MT9M111_MAX_HEIGHT);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_XSIZE_B, width);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_YSIZE_B, height);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_XZOOM_A, MT9M111_MAX_WIDTH);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_YZOOM_A, MT9M111_MAX_HEIGHT);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_XSIZE_A, width);
-               if (ret >= 0)
+               if (!ret)
                        ret = reg_write(REDUCER_YSIZE_A, height);
        }
 
@@ -293,7 +292,7 @@ static int mt9m111_setup_pixfmt(struct soc_camera_device *icd, u16 outfmt)
        int ret;
 
        ret = reg_write(OUTPUT_FORMAT_CTRL2_A, outfmt);
-       if (ret >= 0)
+       if (!ret)
                ret = reg_write(OUTPUT_FORMAT_CTRL2_B, outfmt);
        return ret;
 }
@@ -305,7 +304,6 @@ static int mt9m111_setfmt_bayer8(struct soc_camera_device *icd)
 
 static int mt9m111_setfmt_bayer10(struct soc_camera_device *icd)
 {
-
        return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_BYPASS_IFP);
 }
 
@@ -356,7 +354,7 @@ static int mt9m111_enable(struct soc_camera_device *icd)
        int ret;
 
        ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE);
-       if (ret >= 0)
+       if (!ret)
                mt9m111->powered = 1;
        return ret;
 }
@@ -367,7 +365,7 @@ static int mt9m111_disable(struct soc_camera_device *icd)
        int ret;
 
        ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE);
-       if (ret >= 0)
+       if (!ret)
                mt9m111->powered = 0;
        return ret;
 }
@@ -377,9 +375,9 @@ static int mt9m111_reset(struct soc_camera_device *icd)
        int ret;
 
        ret = reg_set(RESET, MT9M111_RESET_RESET_MODE);
-       if (ret >= 0)
+       if (!ret)
                ret = reg_set(RESET, MT9M111_RESET_RESET_SOC);
-       if (ret >= 0)
+       if (!ret)
                ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE
                                | MT9M111_RESET_RESET_SOC);
        return ret;
@@ -410,7 +408,7 @@ static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f)
 static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt)
 {
        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
-       int ret = 0;
+       int ret;
 
        switch (pixfmt) {
        case V4L2_PIX_FMT_SBGGR8:
@@ -433,7 +431,7 @@ static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt)
                ret = -EINVAL;
        }
 
-       if (ret >= 0)
+       if (!ret)
                mt9m111->pixfmt = pixfmt;
 
        return ret;
@@ -443,7 +441,7 @@ static int mt9m111_set_fmt_cap(struct soc_camera_device *icd,
                               __u32 pixfmt, struct v4l2_rect *rect)
 {
        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
-       int ret = 0;
+       int ret;
 
        mt9m111->left = rect->left;
        mt9m111->top = rect->top;
@@ -455,9 +453,9 @@ static int mt9m111_set_fmt_cap(struct soc_camera_device *icd,
                mt9m111->height);
 
        ret = mt9m111_setup_rect(icd);
-       if (ret >= 0)
+       if (!ret)
                ret = mt9m111_set_pixfmt(icd, pixfmt);
-       return ret < 0 ? ret : 0;
+       return ret;
 }
 
 static int mt9m111_try_fmt_cap(struct soc_camera_device *icd,
@@ -644,7 +642,7 @@ static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)
        if ((gain >= 64 * 2) && (gain < 63 * 2 * 2))
                val = (1 << 10) | (1 << 9) | (gain / 4);
        else if ((gain >= 64) && (gain < 64 * 2))
-               val = (1<<9) | (gain / 2);
+               val = (1 << 9) | (gain / 2);
        else
                val = gain;
 
@@ -661,7 +659,7 @@ static int mt9m111_set_autoexposure(struct soc_camera_device *icd, int on)
        else
                ret = reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
 
-       if (ret >= 0)
+       if (!ret)
                mt9m111->autoexposure = on;
 
        return ret;
@@ -711,7 +709,7 @@ static int mt9m111_set_control(struct soc_camera_device *icd,
 {
        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
        const struct v4l2_queryctrl *qctrl;
-       int ret = 0;
+       int ret;
 
        qctrl = soc_camera_find_qctrl(&mt9m111_ops, ctrl->id);
 
@@ -739,7 +737,7 @@ static int mt9m111_set_control(struct soc_camera_device *icd,
                ret = -EINVAL;
        }
 
-       return ret < 0 ? -EIO : 0;
+       return ret;
 }
 
 int mt9m111_restore_state(struct soc_camera_device *icd)
@@ -763,10 +761,10 @@ static int mt9m111_resume(struct soc_camera_device *icd)
 
        if (mt9m111->powered) {
                ret = mt9m111_enable(icd);
-               if (ret >= 0)
-                       mt9m111_reset(icd);
-               if (ret >= 0)
-                       mt9m111_restore_state(icd);
+               if (!ret)
+                       ret = mt9m111_reset(icd);
+               if (!ret)
+                       ret = mt9m111_restore_state(icd);
        }
        return ret;
 }
@@ -778,15 +776,15 @@ static int mt9m111_init(struct soc_camera_device *icd)
 
        mt9m111->context = HIGHPOWER;
        ret = mt9m111_enable(icd);
-       if (ret >= 0)
-               mt9m111_reset(icd);
-       if (ret >= 0)
-               mt9m111_set_context(icd, mt9m111->context);
-       if (ret >= 0)
-               mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
-       if (ret < 0)
+       if (!ret)
+               ret = mt9m111_reset(icd);
+       if (!ret)
+               ret = mt9m111_set_context(icd, mt9m111->context);
+       if (!ret)
+               ret = mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
+       if (ret)
                dev_err(&icd->dev, "mt9m111 init failed: %d\n", ret);
-       return ret ? -EIO : 0;
+       return ret;
 }
 
 static int mt9m111_release(struct soc_camera_device *icd)
@@ -797,7 +795,7 @@ static int mt9m111_release(struct soc_camera_device *icd)
        if (ret < 0)
                dev_err(&icd->dev, "mt9m111 release failed: %d\n", ret);
 
-       return ret ? -EIO : 0;
+       return ret;
 }
 
 /*