Merge "regulator: core: Add PRE_DISABLE notification" (9f6f20b9) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/regulator/core.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -2018,9 +2018,18 @@ static int _regulator_disable(struct regulator_dev *rdev)

		/* we are last user */
		if (_regulator_can_change_status(rdev)) {
		ret = _notifier_call_chain(rdev,
		REGULATOR_EVENT_PRE_DISABLE,
		NULL);
		if (ret & NOTIFY_STOP_MASK)
		return -EINVAL;

		ret = _regulator_do_disable(rdev);
		if (ret < 0) {
		rdev_err(rdev, "failed to disable\n");
		_notifier_call_chain(rdev,
		REGULATOR_EVENT_ABORT_DISABLE,
		NULL);
		return ret;
		}
		_notifier_call_chain(rdev, REGULATOR_EVENT_DISABLE,
		@@ -2079,9 +2088,16 @@ static int _regulator_force_disable(struct regulator_dev *rdev)
		{
		int ret = 0;

		ret = _notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE \|
		REGULATOR_EVENT_PRE_DISABLE, NULL);
		if (ret & NOTIFY_STOP_MASK)
		return -EINVAL;

		ret = _regulator_do_disable(rdev);
		if (ret < 0) {
		rdev_err(rdev, "failed to force disable\n");
		_notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE \|
		REGULATOR_EVENT_ABORT_DISABLE, NULL);
		return ret;
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -96,12 +96,14 @@ struct regmap;
		* FORCE_DISABLE Regulator forcibly shut down by software.
		* VOLTAGE_CHANGE Regulator voltage changed.
		* Data passed is old voltage cast to (void *).
		* ENABLE Regulator was enabled.
		* DISABLE Regulator was disabled.
		* PRE_VOLTAGE_CHANGE Regulator is about to have voltage changed.
		* Data passed is "struct pre_voltage_change_data"
		* ABORT_VOLTAGE_CHANGE Regulator voltage change failed for some reason.
		* Data passed is old voltage cast to (void *).
		* ENABLE Regulator was enabled.
		* PRE_DISABLE Regulator is about to be disabled
		* ABORT_DISABLE Regulator disable failed for some reason
		*
		* NOTE: These events can be OR'ed together when passed into handler.
		*/
		@@ -116,6 +118,8 @@ struct regmap;
		#define REGULATOR_EVENT_DISABLE 0x80
		#define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE 0x100
		#define REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE 0x200
		#define REGULATOR_EVENT_PRE_DISABLE 0x400
		#define REGULATOR_EVENT_ABORT_DISABLE 0x800

		/**
		* struct pre_voltage_change_data - Data sent with PRE_VOLTAGE_CHANGE event