Merge branch 'topic/hda-beep' into topic/hda

8 files changed, 49 insertions, 80 deletions

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 67f47d891959..52b5c0bf90c1 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2769,7 +2769,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,
         chip->tea.ops = &snd_es1968_tea_ops;
         strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));
         sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
-        if (!snd_tea575x_init(&chip->tea))
+        if (!snd_tea575x_init(&chip->tea, THIS_MODULE))
                 printk(KERN_INFO "es1968: detected TEA575x radio\n");
 #endif
 
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index f69662322750..b32e8024ea86 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1254,7 +1254,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
         sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
         if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
             (tea575x_tuner & TUNER_TYPE_MASK) < 4) {
-                if (snd_tea575x_init(&chip->tea)) {
+                if (snd_tea575x_init(&chip->tea, THIS_MODULE)) {
                         snd_printk(KERN_ERR "TEA575x radio not found\n");
                         snd_fm801_free(chip);
                         return -ENODEV;
@@ -1263,7 +1263,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                 /* autodetect tuner connection */
                 for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) {
                         chip->tea575x_tuner = tea575x_tuner;
-                        if (!snd_tea575x_init(&chip->tea)) {
+                        if (!snd_tea575x_init(&chip->tea, THIS_MODULE)) {
                                 snd_printk(KERN_INFO "detected TEA575x radio type %s\n",
                                            get_tea575x_gpio(chip)->name);
                                 break;
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index d03079764189..194d625c1f83 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -53,15 +53,14 @@ config SND_HDA_INPUT_BEEP
           driver. This interface is used to generate digital beeps.
 
 config SND_HDA_INPUT_BEEP_MODE
-        int "Digital beep registration mode (0=off, 1=on, 2=mute sw on/off)"
+        int "Digital beep registration mode (0=off, 1=on)"
         depends on SND_HDA_INPUT_BEEP=y
         default "1"
-        range 0 2
+        range 0 1
         help
           Set 0 to disable the digital beep interface for HD-audio by default.
           Set 1 to always enable the digital beep interface for HD-audio by
-          default. Set 2 to control the beep device registration to input
-          layer using a "Beep Switch" in mixer applications.
+          default.
 
 config SND_HDA_INPUT_JACK
         bool "Support jack plugging notification via input layer"
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 60738e52b8f9..0bc2315b181d 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -162,50 +162,20 @@ static int snd_hda_do_attach(struct hda_beep *beep)
         return 0;
 }
 
-static void snd_hda_do_register(struct work_struct *work)
-{
-        struct hda_beep *beep =
-                container_of(work, struct hda_beep, register_work);
-
-        mutex_lock(&beep->mutex);
-        if (beep->enabled && !beep->dev)
-                snd_hda_do_attach(beep);
-        mutex_unlock(&beep->mutex);
-}
-
-static void snd_hda_do_unregister(struct work_struct *work)
-{
-        struct hda_beep *beep =
-                container_of(work, struct hda_beep, unregister_work.work);
-
-        mutex_lock(&beep->mutex);
-        if (!beep->enabled && beep->dev)
-                snd_hda_do_detach(beep);
-        mutex_unlock(&beep->mutex);
-}
-
 int snd_hda_enable_beep_device(struct hda_codec *codec, int enable)
 {
         struct hda_beep *beep = codec->beep;
-        enable = !!enable;
-        if (beep == NULL)
+        if (!beep)
                 return 0;
+        enable = !!enable;
         if (beep->enabled != enable) {
                 beep->enabled = enable;
                 if (!enable) {
+                        cancel_work_sync(&beep->beep_work);
                         /* turn off beep */
                         snd_hda_codec_write(beep->codec, beep->nid, 0,
                                                   AC_VERB_SET_BEEP_CONTROL, 0);
                 }
-                if (beep->mode == HDA_BEEP_MODE_SWREG) {
-                        if (enable) {
-                                cancel_delayed_work(&beep->unregister_work);
-                                schedule_work(&beep->register_work);
-                        } else {
-                                schedule_delayed_work(&beep->unregister_work,
-                                                                           HZ);
-                        }
-                }
                 return 1;
         }
         return 0;
@@ -215,6 +185,7 @@ EXPORT_SYMBOL_HDA(snd_hda_enable_beep_device);
 int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 {
         struct hda_beep *beep;
+        int err;
 
         if (!snd_hda_get_bool_hint(codec, "beep"))
                 return 0; /* disabled explicitly by hints */
@@ -232,21 +203,16 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 
         beep->nid = nid;
         beep->codec = codec;
-        beep->mode = codec->beep_mode;
         codec->beep = beep;
 
-        INIT_WORK(&beep->register_work, &snd_hda_do_register);
-        INIT_DELAYED_WORK(&beep->unregister_work, &snd_hda_do_unregister);
         INIT_WORK(&beep->beep_work, &snd_hda_generate_beep);
         mutex_init(&beep->mutex);
 
-        if (beep->mode == HDA_BEEP_MODE_ON) {
-                int err = snd_hda_do_attach(beep);
-                if (err < 0) {
-                        kfree(beep);
-                        codec->beep = NULL;
-                        return err;
-                }
+        err = snd_hda_do_attach(beep);
+        if (err < 0) {
+                kfree(beep);
+                codec->beep = NULL;
+                return err;
         }
 
         return 0;
@@ -257,8 +223,6 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
 {
         struct hda_beep *beep = codec->beep;
         if (beep) {
-                cancel_work_sync(&beep->register_work);
-                cancel_delayed_work(&beep->unregister_work);
                 if (beep->dev)
                         snd_hda_do_detach(beep);
                 codec->beep = NULL;
@@ -266,3 +230,31 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
         }
 }
 EXPORT_SYMBOL_HDA(snd_hda_detach_beep_device);
+
+/* get/put callbacks for beep mute mixer switches */
+int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_beep *beep = codec->beep;
+        if (beep) {
+                ucontrol->value.integer.value[0] =
+                        ucontrol->value.integer.value[1] =
+                        beep->enabled;
+                return 0;
+        }
+        return snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
+}
+EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_get_beep);
+
+int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_beep *beep = codec->beep;
+        if (beep)
+                snd_hda_enable_beep_device(codec,
+                                           *ucontrol->value.integer.value);
+        return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
+}
+EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep);
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 55f0647458c7..4dc6933bc655 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -26,21 +26,16 @@
 
 #define HDA_BEEP_MODE_OFF       0
 #define HDA_BEEP_MODE_ON        1
-#define HDA_BEEP_MODE_SWREG     2
 
 /* beep information */
 struct hda_beep {
         struct input_dev *dev;
         struct hda_codec *codec;
-        unsigned int mode;
         char phys[32];
         int tone;
         hda_nid_t nid;
         unsigned int enabled:1;
-        unsigned int request_enable:1;
         unsigned int linear_tone:1;     /* linear tone for IDT/STAC codec */
-        struct work_struct register_work; /* registration work */
-        struct delayed_work unregister_work; /* unregistration work */
         struct work_struct beep_work; /* scheduled task for beep event */
         struct mutex mutex;
 };
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 14bc1c8f5326..20580bf69697 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2676,25 +2676,6 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put);
 
-#ifdef CONFIG_SND_HDA_INPUT_BEEP
-/**
- * snd_hda_mixer_amp_switch_put_beep - Put callback for a beep AMP switch
- *
- * This function calls snd_hda_enable_beep_device(), which behaves differently
- * depending on beep_mode option.
- */
-int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,
-                                      struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-
-        snd_hda_enable_beep_device(codec, *valp);
-        return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
-}
-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep);
-#endif /* CONFIG_SND_HDA_INPUT_BEEP */
-
 /*
  * bound volume controls
  *
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 86758dded981..796472d1ff5a 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -72,7 +72,7 @@ static int enable_msi = -1;
 static char *patch[SNDRV_CARDS];
 #endif
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
-static int beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] =
+static bool beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] =
                                         CONFIG_SND_HDA_INPUT_BEEP_MODE};
 #endif
 
@@ -103,9 +103,9 @@ module_param_array(patch, charp, NULL, 0444);
 MODULE_PARM_DESC(patch, "Patch file for Intel HD audio interface.");
 #endif
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
-module_param_array(beep_mode, int, NULL, 0444);
+module_param_array(beep_mode, bool, NULL, 0444);
 MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode "
-                            "(0=off, 1=on, 2=mute switch on/off) (default=1).");
+                            "(0=off, 1=on) (default=1).");
 #endif
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 9a096a8e0fc5..1b4c12941baa 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -89,7 +89,7 @@
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \
           .subdevice = HDA_SUBDEV_AMP_FLAG, \
           .info = snd_hda_mixer_amp_switch_info, \
-          .get = snd_hda_mixer_amp_switch_get, \
+          .get = snd_hda_mixer_amp_switch_get_beep, \
           .put = snd_hda_mixer_amp_switch_put_beep, \
           .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
 #else
@@ -121,6 +121,8 @@ int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,
 int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol);
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
+int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol);
 int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol);
 #endif