forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

pinctrl: rockchip: Fix some clang warnings

Browse source 
This patch fixes the following warnings:
drivers/pinctrl/pinctrl-rockchip.c:1869:9: warning: 1st function call argument is an uninitialized value
                ret = regmap_read(extra_regmap, extra_reg, &temp);
                      ^
drivers/pinctrl/pinctrl-rockchip.c:1999:48: warning: The left operand of '+' is a garbage value
                data = ((1 << rmask_bits) - 1) << (extra_bit + 16);
                                                   ^

Change-Id: Ie1bfe825925505314d5d9a4d5491e38768916dbd
Signed-off-by: David Wu <david.wu@rock-chips.com>
This commit is contained in:
David Wu 2018-01-30 19:31:44 +08:00 • committed by Tao Huang
commit f479e502c8
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drivers/pinctrl/pinctrl-rockchip.c
View file

@ -1844,6 +1844,9 @@ static int rockchip_get_drive_perpin(struct rockchip_pin_bank *bank,
break;
case DRV_TYPE_IO_WIDE_LEVEL:
if (!ctrl->drv_calc_extra_reg)
return -EINVAL;
rmask_bits = RK3288_DRV_BITS_PER_PIN;
/* enable the write to the equivalent lower bits */
ret = regmap_read(regmap, reg, &data);
@ -1856,11 +1859,10 @@ static int rockchip_get_drive_perpin(struct rockchip_pin_bank *bank,
* assume the drive strength of N channel and
* P channel are the same.
*/
if (ctrl->drv_calc_extra_reg)
ctrl->drv_calc_extra_reg(bank, pin_num,
&extra_regmap,
&extra_reg,
&extra_bit);
ctrl->drv_calc_extra_reg(bank, pin_num,
&extra_regmap,
&extra_reg,
&extra_bit);
/*
* It is enough to read one channel drive strength,
@ -1981,6 +1983,9 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank,
}
break;
case DRV_TYPE_IO_WIDE_LEVEL:
if (!ctrl->drv_calc_extra_reg)
return -EINVAL;
extra_value = ((strength -
rockchip_perpin_drv_list[drv_type][ret])) >> 1;
rmask_bits = RK3288_DRV_BITS_PER_PIN;
@ -1989,11 +1994,10 @@ static int rockchip_set_drive_perpin(struct rockchip_pin_bank *bank,
* assume the drive strength of N channel and
* P channel are the same.
*/
if (ctrl->drv_calc_extra_reg)
extra_drv_type = ctrl->drv_calc_extra_reg(bank, pin_num,
&extra_regmap,
&extra_reg,
&extra_bit);
extra_drv_type = ctrl->drv_calc_extra_reg(bank, pin_num,
&extra_regmap,
&extra_reg,
&extra_bit);
/* enable the write to the equivalent lower bits */
data = ((1 << rmask_bits) - 1) << (extra_bit + 16);