Commit 08e8c0d9 authored by Robin Murphy's avatar Robin Murphy Committed by Lee Jones

mfd: rk808: Ensure suspend/resume hooks always work

The RK809/RK817 suspend/resume hooks should not have to depend on
whether this driver owns the pm_power_off hook, and thus the global
rk808_i2c_client is set - indeed, the GPIO-based control is really
only relevant when PSCI firmware is in charge of power rather than
the kernel. As driver model callbacks, they have an appropriate
device argument to hand, so can just always use that.
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent d8f083a3
...@@ -712,7 +712,7 @@ static int rk808_remove(struct i2c_client *client) ...@@ -712,7 +712,7 @@ static int rk808_remove(struct i2c_client *client)
static int __maybe_unused rk8xx_suspend(struct device *dev) static int __maybe_unused rk8xx_suspend(struct device *dev)
{ {
struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); struct rk808 *rk808 = i2c_get_clientdata(to_i2c_client(dev));
int ret = 0; int ret = 0;
switch (rk808->variant) { switch (rk808->variant) {
...@@ -732,7 +732,7 @@ static int __maybe_unused rk8xx_suspend(struct device *dev) ...@@ -732,7 +732,7 @@ static int __maybe_unused rk8xx_suspend(struct device *dev)
static int __maybe_unused rk8xx_resume(struct device *dev) static int __maybe_unused rk8xx_resume(struct device *dev)
{ {
struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client); struct rk808 *rk808 = i2c_get_clientdata(to_i2c_client(dev));
int ret = 0; int ret = 0;
switch (rk808->variant) { switch (rk808->variant) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment