The patch number 8686 was added via Guennadi Liakhovetski <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
mt9m111: style cleanup
Fix a typo in Kconfig, simplify error checking, further minor cleanup.
Signed-off-by: Guennadi Liakhovetski <[EMAIL PROTECTED]>
Tested-by: Robert Jarzmik <[EMAIL PROTECTED]>
---
drivers/media/video/Kconfig | 2 +-
drivers/media/video/mt9m111.c | 86 ++++++++++++++++++++---------------------
2 files changed, 43 insertions(+), 45 deletions(-)
---
linux/drivers/media/video/Kconfig | 2
linux/drivers/media/video/mt9m111.c | 86 +++++++++++++---------------
2 files changed, 43 insertions(+), 45 deletions(-)
diff -r 5ce9b5ee0f4e -r 443542329018 linux/drivers/media/video/Kconfig
--- a/linux/drivers/media/video/Kconfig Thu Aug 14 17:03:18 2008 +0200
+++ b/linux/drivers/media/video/Kconfig Thu Aug 14 17:03:49 2008 +0200
@@ -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 -r 5ce9b5ee0f4e -r 443542329018 linux/drivers/media/video/mt9m111.c
--- a/linux/drivers/media/video/mt9m111.c Thu Aug 14 17:03:18 2008 +0200
+++ b/linux/drivers/media/video/mt9m111.c Thu Aug 14 17:03:49 2008 +0200
@@ -173,7 +173,7 @@ static int reg_page_map_set(struct i2c_c
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_
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_setup_rect(struct soc
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
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 s
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
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_cam
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_ca
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_came
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_pixfmt(struct soc
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
ret = -EINVAL;
}
- if (ret >= 0)
+ if (!ret)
mt9m111->pixfmt = pixfmt;
return ret;
@@ -443,7 +441,7 @@ static int mt9m111_set_fmt_cap(struct so
__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 so
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(struc
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(stru
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 so
{
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 so
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_cam
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_camer
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_ca
if (ret < 0)
dev_err(&icd->dev, "mt9m111 release failed: %d\n", ret);
- return ret ? -EIO : 0;
+ return ret;
}
/*
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/443542329018f8f4b9eba4e6ab845d22126c77d7
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
