diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-06-05 11:41:56 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-06-05 11:41:56 -0700 |
| commit | b46bcc0a3da47431f2711c3d63e9507cfab18ecd (patch) | |
| tree | 6b9355395470108f5161840638bf48af0e10f3c1 /drivers/media/video/tegra/ad5816.c | |
| parent | 63fb092060747250a0dd305bd11018caebe23d65 (diff) | |
| parent | f61bdbde09605793cfa05f7c59545c62b5e08aa6 (diff) | |
Merge commit 'main-ics-2012.06.04-A5' into HEAD
Conflicts:
drivers/media/video/tegra/nvavp/nvavp_dev.c
Change-Id: I7779b0ce58004f80cccf6193148ac49551ce5da5
Diffstat (limited to 'drivers/media/video/tegra/ad5816.c')
| -rw-r--r-- | drivers/media/video/tegra/ad5816.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/video/tegra/ad5816.c b/drivers/media/video/tegra/ad5816.c index d95368f43cf6..ed113b3a187c 100644 --- a/drivers/media/video/tegra/ad5816.c +++ b/drivers/media/video/tegra/ad5816.c @@ -249,9 +249,8 @@ static int ad5816_i2c_wr16(struct ad5816_info *info, u8 reg, u16 val) return 0; } -static int ad5816_gpio_wr(struct ad5816_info *info, - enum ad5816_gpio_types i, - int val) /* val: 0=deassert, 1=assert */ +static int ad5816_gpio_wr(struct ad5816_info *info, ad5816_gpio_types i, + int val) /* val: 0=deassert, 1=assert */ { int err = -EINVAL; if (info->gpio[i].valid) { @@ -370,8 +369,7 @@ static void ad5816_gpio_init(struct ad5816_info *info) } } -static int ad5816_vreg_dis(struct ad5816_info *info, - enum ad5816_vreg i) +static int ad5816_vreg_dis(struct ad5816_info *info, ad5816_vreg i) { int err = 0; if (info->vreg[i].vreg_flag && (info->vreg[i].vreg != NULL)) { @@ -396,8 +394,7 @@ static int ad5816_vreg_dis_all(struct ad5816_info *info) return err; } -static int ad5816_vreg_en(struct ad5816_info *info, - enum ad5816_vreg i) +static int ad5816_vreg_en(struct ad5816_info *info, ad5816_vreg i) { int err = 0; if (!info->vreg[i].vreg_flag && (info->vreg[i].vreg != NULL)) { |