4 files changed, 47 insertions, 14 deletions

diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c
index c6bba99a90b2..88844881cbff 100644
--- a/sound/i2c/other/ak4113.c
+++ b/sound/i2c/other/ak4113.c
@@ -89,6 +89,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
         chip->private_data = private_data;
         INIT_DELAYED_WORK(&chip->work, ak4113_stats);
         atomic_set(&chip->wq_processing, 0);
+        mutex_init(&chip->reinit_mutex);
 
         for (reg = 0; reg < AK4113_WRITABLE_REGS ; reg++)
                 chip->regmap[reg] = pgm[reg];
@@ -141,7 +142,9 @@ void snd_ak4113_reinit(struct ak4113 *chip)
 {
         if (atomic_inc_return(&chip->wq_processing) == 1)
                 cancel_delayed_work_sync(&chip->work);
+        mutex_lock(&chip->reinit_mutex);
         ak4113_init_regs(chip);
+        mutex_unlock(&chip->reinit_mutex);
         /* bring up statistics / event queing */
         if (atomic_dec_and_test(&chip->wq_processing))
                 schedule_delayed_work(&chip->work, HZ / 10);
@@ -636,3 +639,19 @@ static void ak4113_stats(struct work_struct *work)
         if (atomic_dec_and_test(&chip->wq_processing))
                 schedule_delayed_work(&chip->work, HZ / 10);
 }
+
+#ifdef CONFIG_PM
+void snd_ak4113_suspend(struct ak4113 *chip)
+{
+        atomic_inc(&chip->wq_processing); /* don't schedule new work */
+        cancel_delayed_work_sync(&chip->work);
+}
+EXPORT_SYMBOL(snd_ak4113_suspend);
+
+void snd_ak4113_resume(struct ak4113 *chip)
+{
+        atomic_dec(&chip->wq_processing);
+        snd_ak4113_reinit(chip);
+}
+EXPORT_SYMBOL(snd_ak4113_resume);
+#endif
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index b70e6eccbd03..5a4cf3fab4ae 100644
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -100,6 +100,7 @@ int snd_ak4114_create(struct snd_card *card,
         chip->private_data = private_data;
         INIT_DELAYED_WORK(&chip->work, ak4114_stats);
         atomic_set(&chip->wq_processing, 0);
+        mutex_init(&chip->reinit_mutex);
 
         for (reg = 0; reg < 6; reg++)
                 chip->regmap[reg] = pgm[reg];
@@ -122,6 +123,7 @@ int snd_ak4114_create(struct snd_card *card,
         snd_ak4114_free(chip);
         return err < 0 ? err : -EIO;
 }
+EXPORT_SYMBOL(snd_ak4114_create);
 
 void snd_ak4114_reg_write(struct ak4114 *chip, unsigned char reg, unsigned char mask, unsigned char val)
 {
@@ -131,6 +133,7 @@ void snd_ak4114_reg_write(struct ak4114 *chip, unsigned char reg, unsigned char
                 reg_write(chip, reg,
                           (chip->txcsb[reg-AK4114_REG_TXCSB0] & ~mask) | val);
 }
+EXPORT_SYMBOL(snd_ak4114_reg_write);
 
 static void ak4114_init_regs(struct ak4114 *chip)
 {
@@ -154,11 +157,14 @@ void snd_ak4114_reinit(struct ak4114 *chip)
 {
         if (atomic_inc_return(&chip->wq_processing) == 1)
                 cancel_delayed_work_sync(&chip->work);
+        mutex_lock(&chip->reinit_mutex);
         ak4114_init_regs(chip);
+        mutex_unlock(&chip->reinit_mutex);
         /* bring up statistics / event queing */
         if (atomic_dec_and_test(&chip->wq_processing))
                 schedule_delayed_work(&chip->work, HZ / 10);
 }
+EXPORT_SYMBOL(snd_ak4114_reinit);
 
 static unsigned int external_rate(unsigned char rcs1)
 {
@@ -503,6 +509,7 @@ int snd_ak4114_build(struct ak4114 *ak4114,
         schedule_delayed_work(&ak4114->work, HZ / 10);
         return 0;
 }
+EXPORT_SYMBOL(snd_ak4114_build);
 
 /* notify kcontrols if any parameters are changed */
 static void ak4114_notify(struct ak4114 *ak4114,
@@ -558,6 +565,7 @@ int snd_ak4114_external_rate(struct ak4114 *ak4114)
         rcs1 = reg_read(ak4114, AK4114_REG_RCS1);
         return external_rate(rcs1);
 }
+EXPORT_SYMBOL(snd_ak4114_external_rate);
 
 int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)
 {
@@ -605,6 +613,7 @@ int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)
         }
         return res;
 }
+EXPORT_SYMBOL(snd_ak4114_check_rate_and_errors);
 
 static void ak4114_stats(struct work_struct *work)
 {
@@ -616,9 +625,18 @@ static void ak4114_stats(struct work_struct *work)
                 schedule_delayed_work(&chip->work, HZ / 10);
 }
 
-EXPORT_SYMBOL(snd_ak4114_create);
-EXPORT_SYMBOL(snd_ak4114_reg_write);
-EXPORT_SYMBOL(snd_ak4114_reinit);
-EXPORT_SYMBOL(snd_ak4114_build);
-EXPORT_SYMBOL(snd_ak4114_external_rate);
-EXPORT_SYMBOL(snd_ak4114_check_rate_and_errors);
+#ifdef CONFIG_PM
+void snd_ak4114_suspend(struct ak4114 *chip)
+{
+        atomic_inc(&chip->wq_processing); /* don't schedule new work */
+        cancel_delayed_work_sync(&chip->work);
+}
+EXPORT_SYMBOL(snd_ak4114_suspend);
+
+void snd_ak4114_resume(struct ak4114 *chip)
+{
+        atomic_dec(&chip->wq_processing);
+        snd_ak4114_reinit(chip);
+}
+EXPORT_SYMBOL(snd_ak4114_resume);
+#endif
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c
index 88452e899bd9..48848909a5a9 100644
--- a/sound/i2c/other/ak4117.c
+++ b/sound/i2c/other/ak4117.c
@@ -91,9 +91,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t
         chip->read = read;
         chip->write = write;
         chip->private_data = private_data;
-        init_timer(&chip->timer);
-        chip->timer.data = (unsigned long)chip;
-        chip->timer.function = snd_ak4117_timer;
+        setup_timer(&chip->timer, snd_ak4117_timer, (unsigned long)chip);
 
         for (reg = 0; reg < 5; reg++)
                 chip->regmap[reg] = pgm[reg];
@@ -139,8 +137,7 @@ void snd_ak4117_reinit(struct ak4117 *chip)
         /* release powerdown, everything is initialized now */
         reg_write(chip, AK4117_REG_PWRDN, old | AK4117_RST | AK4117_PWN);
         chip->init = 0;
-        chip->timer.expires = 1 + jiffies;
-        add_timer(&chip->timer);
+        mod_timer(&chip->timer, 1 + jiffies);
 }
 
 static unsigned int external_rate(unsigned char rcs1)
@@ -540,8 +537,7 @@ static void snd_ak4117_timer(unsigned long data)
         if (chip->init)
                 return;
         snd_ak4117_check_rate_and_errors(chip, 0);
-        chip->timer.expires = 1 + jiffies;
-        add_timer(&chip->timer);
+        mod_timer(&chip->timer, 1 + jiffies);
 }
 
 EXPORT_SYMBOL(snd_ak4117_create);
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c
index 67dbfde837ab..c65731088aa2 100644
--- a/sound/i2c/other/ak4xxx-adda.c
+++ b/sound/i2c/other/ak4xxx-adda.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>