gpio: pca953x: Split pca953x_restore_context() and pca953x_save_context()

[ Upstream commit ec5bde62019b0a5300c67bd81b9864a8ea12274e ]

Split regcache handling to the respective helpers. It will allow to
have further refactoring with ease.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Stable-dep-of: 3e38f946062b ("gpio: pca953x: fix IRQ storm on system wake up")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index b882b26ab5007bd871d6ce316b35f1634efabdae..fddf0cf031007e2cd4566c5a88fdd392c8e86b3a 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -1168,9 +1168,9 @@ static int pca953x_probe(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM_SLEEP
-static int pca953x_regcache_sync(struct device *dev)
+static int pca953x_regcache_sync(struct pca953x_chip *chip)
 {
-       struct pca953x_chip *chip = dev_get_drvdata(dev);
+       struct device *dev = &chip->client->dev;
        int ret;
        u8 regaddr;
 
@@ -1217,13 +1217,37 @@ static int pca953x_regcache_sync(struct device *dev)
        return 0;
 }
 
-static int pca953x_suspend(struct device *dev)
+static int pca953x_restore_context(struct pca953x_chip *chip)
 {
-       struct pca953x_chip *chip = dev_get_drvdata(dev);
+       int ret;
+
+       mutex_lock(&chip->i2c_lock);
+
+       regcache_cache_only(chip->regmap, false);
+       regcache_mark_dirty(chip->regmap);
+       ret = pca953x_regcache_sync(chip);
+       if (ret) {
+               mutex_unlock(&chip->i2c_lock);
+               return ret;
+       }
+
+       ret = regcache_sync(chip->regmap);
+       mutex_unlock(&chip->i2c_lock);
+       return ret;
+}
 
+static void pca953x_save_context(struct pca953x_chip *chip)
+{
        mutex_lock(&chip->i2c_lock);
        regcache_cache_only(chip->regmap, true);
        mutex_unlock(&chip->i2c_lock);
+}
+
+static int pca953x_suspend(struct device *dev)
+{
+       struct pca953x_chip *chip = dev_get_drvdata(dev);
+
+       pca953x_save_context(chip);
 
        if (atomic_read(&chip->wakeup_path))
                device_set_wakeup_path(dev);
@@ -1246,17 +1270,7 @@ static int pca953x_resume(struct device *dev)
                }
        }
 
-       mutex_lock(&chip->i2c_lock);
-       regcache_cache_only(chip->regmap, false);
-       regcache_mark_dirty(chip->regmap);
-       ret = pca953x_regcache_sync(dev);
-       if (ret) {
-               mutex_unlock(&chip->i2c_lock);
-               return ret;
-       }
-
-       ret = regcache_sync(chip->regmap);
-       mutex_unlock(&chip->i2c_lock);
+       ret = pca953x_restore_context(chip);
        if (ret) {
                dev_err(dev, "Failed to restore register map: %d\n", ret);
                return ret;