ALSA: hda - Use standard device registration for beep

[linux.git] / sound / pci / hda / hda_codec.c

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index dc7b342f00effef65033b5f09c9d05c146dbd043..5f2005098a60bed87fd16248c295aaff66b1c67d 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -813,7 +813,6 @@ void snd_hda_codec_register(struct hda_codec *codec)
        if (codec->registered)
                return;
        if (device_is_registered(hda_codec_dev(codec))) {
-               snd_hda_register_beep_device(codec);
                codec_display_power(codec, true);
                pm_runtime_enable(hda_codec_dev(codec));
                /* it was powered up in snd_hda_codec_new(), now all done */
@@ -828,14 +827,6 @@ static int snd_hda_codec_dev_register(struct snd_device *device)
        return 0;
 }
 
-static int snd_hda_codec_dev_disconnect(struct snd_device *device)
-{
-       struct hda_codec *codec = device->device_data;
-
-       snd_hda_detach_beep_device(codec);
-       return 0;
-}
-
 static int snd_hda_codec_dev_free(struct snd_device *device)
 {
        struct hda_codec *codec = device->device_data;
@@ -921,7 +912,6 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
        int err;
        static struct snd_device_ops dev_ops = {
                .dev_register = snd_hda_codec_dev_register,
-               .dev_disconnect = snd_hda_codec_dev_disconnect,
                .dev_free = snd_hda_codec_dev_free,
        };