Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79b53d19 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: s5m8767: Define symbol for buck control mask 



Replace hard-coded value for mask used in BUCKX_CTRL registers (for
BUCKX_EN field) with a symbol. This also removes two local variables.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1

drivers/regulator/s5m8767.c

+6 −5
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int s5m8767_reg_is_enabled(struct regulator_dev *rdev) 
{

	struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);

	int ret, reg;

	int mask = 0xc0, enable_ctrl;

	int enable_ctrl;

	unsigned int val;



	ret = s5m8767_get_register(rdev, &reg, &enable_ctrl);
@@ -230,27 +230,28 @@ static int s5m8767_reg_is_enabled(struct regulator_dev *rdev) 
	if (ret)

		return ret;



	return (val & mask) == enable_ctrl;

	return (val & S5M8767_ENCTRL_MASK) == enable_ctrl;

}



static int s5m8767_reg_enable(struct regulator_dev *rdev)

{

	struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);

	int ret, reg;

	int mask = 0xc0, enable_ctrl;

	int enable_ctrl;



	ret = s5m8767_get_register(rdev, &reg, &enable_ctrl);

	if (ret)

		return ret;



	return sec_reg_update(s5m8767->iodev, reg, enable_ctrl, mask);

	return sec_reg_update(s5m8767->iodev, reg, enable_ctrl,

			S5M8767_ENCTRL_MASK);

}



static int s5m8767_reg_disable(struct regulator_dev *rdev)

{

	struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);

	int ret, reg;

	int  mask = 0xc0, enable_ctrl;

	int mask = S5M8767_ENCTRL_MASK, enable_ctrl;



	ret = s5m8767_get_register(rdev, &reg, &enable_ctrl);

	if (ret)

include/linux/mfd/samsung/s5m8767.h

+2 −1
Original line number Diff line number Diff line
@@ -184,5 +184,6 @@ enum s5m8767_regulators { 
};



#define S5M8767_ENCTRL_SHIFT		6

#define S5M8767_ENCTRL_MASK		(0x3 << S5M8767_ENCTRL_SHIFT)



#endif /* __LINUX_MFD_S5M8767_H */