The patch titled
alsa: soc wm8750 fix
has been removed from the -mm tree. Its filename was
alsa-soc-wm8750-fix.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: alsa: soc wm8750 fix
From: "Eugene Ilkov" <e.ilkov@xxxxxxxxx>
There was some INIT_WORK related changes, here is patch against wm8750
codec driver. Tested on sharp sl-c1000
Cc: Jaroslav Kysela <perex@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/soc/codecs/wm8750.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff -puN sound/soc/codecs/wm8750.c~alsa-soc-wm8750-fix sound/soc/codecs/wm8750.c
--- a/sound/soc/codecs/wm8750.c~alsa-soc-wm8750-fix
+++ a/sound/soc/codecs/wm8750.c
@@ -51,8 +51,6 @@
#define warn(format, arg...) \
printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)
-static struct work_struct wm8750_dapm_work;
-
/*
* wm8750 register cache
* We can't read the WM8750 register space when we
@@ -1000,9 +998,11 @@ struct snd_soc_codec_dai wm8750_dai = {
};
EXPORT_SYMBOL_GPL(wm8750_dai);
-static void wm8750_work(void *data)
+static void wm8750_work(struct work_struct *work)
{
- struct snd_soc_codec *codec = (struct snd_soc_codec *)data;
+ struct snd_soc_device *socdev =
+ container_of(work, struct snd_soc_device, delayed_work.work);
+ struct snd_soc_codec *codec = socdev->codec;
wm8750_dapm_event(codec, codec->dapm_state);
}
@@ -1038,7 +1038,7 @@ static int wm8750_resume(struct platform
if (codec->suspend_dapm_state == SNDRV_CTL_POWER_D0) {
wm8750_dapm_event(codec, SNDRV_CTL_POWER_D2);
codec->dapm_state = SNDRV_CTL_POWER_D0;
- schedule_delayed_work(&wm8750_dapm_work,
+ queue_delayed_work(wm8750_workq, &socdev->delayed_work,
msecs_to_jiffies(1000));
}
@@ -1083,7 +1083,8 @@ static int wm8750_init(struct snd_soc_de
/* charge output caps */
wm8750_dapm_event(codec, SNDRV_CTL_POWER_D2);
codec->dapm_state = SNDRV_CTL_POWER_D3hot;
- schedule_delayed_work(&wm8750_dapm_work, msecs_to_jiffies(1000));
+ queue_delayed_work(wm8750_workq, &socdev->delayed_work,
+ msecs_to_jiffies(1000));
/* set the update bits */
reg = wm8750_read_reg_cache(codec, WM8750_LDAC);
@@ -1225,7 +1226,7 @@ static int wm8750_probe(struct platform_
INIT_LIST_HEAD(&codec->dapm_widgets);
INIT_LIST_HEAD(&codec->dapm_paths);
wm8750_socdev = socdev;
- INIT_WORK(&wm8750_dapm_work, wm8750_work, codec);
+ INIT_DELAYED_WORK(&socdev->delayed_work, wm8750_work);
#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE)
if (setup->i2c_address) {
normal_i2c[0] = setup->i2c_address;
_
Patches currently in -mm which might be from e.ilkov@xxxxxxxxx are
alsa-soc-wm8750-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
