ALSA: Remove the rest of __devinit* in comments

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_analog.c

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 1eeba738666634329d17a76149618c1c6f3e8c26..89fc5030ec792b97204f5d296571d7280669bfc3 100644 (file)
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -636,7 +636,6 @@ static void ad198x_free(struct hda_codec *codec)
        if (!spec)
                return;
 
-       ad198x_shutup(codec);
        ad198x_free_kctls(codec);
        kfree(spec);
        snd_hda_detach_beep_device(codec);
@@ -1247,16 +1246,27 @@ static int is_jack_available(struct hda_codec *codec, hda_nid_t nid)
        return get_defcfg_connect(conf) != AC_JACK_PORT_NONE;
 }
 
-static int patch_ad1986a(struct hda_codec *codec)
+static int alloc_ad_spec(struct hda_codec *codec)
 {
        struct ad198x_spec *spec;
-       int err, board_config;
 
        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-       if (spec == NULL)
+       if (!spec)
                return -ENOMEM;
-
        codec->spec = spec;
+       snd_array_init(&spec->kctls, sizeof(struct snd_kcontrol_new), 32);
+       return 0;
+}
+
+static int patch_ad1986a(struct hda_codec *codec)
+{
+       struct ad198x_spec *spec;
+       int err, board_config;
+
+       err = alloc_ad_spec(codec);
+       if (err < 0)
+               return err;
+       spec = codec->spec;
 
        err = snd_hda_attach_beep_device(codec, 0x19);
        if (err < 0) {
@@ -1549,11 +1559,10 @@ static int patch_ad1983(struct hda_codec *codec)
        struct ad198x_spec *spec;
        int err;
 
-       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-       if (spec == NULL)
-               return -ENOMEM;
-
-       codec->spec = spec;
+       err = alloc_ad_spec(codec);
+       if (err < 0)
+               return err;
+       spec = codec->spec;
 
        err = snd_hda_attach_beep_device(codec, 0x10);
        if (err < 0) {
@@ -1955,11 +1964,10 @@ static int patch_ad1981(struct hda_codec *codec)
        struct ad198x_spec *spec;
        int err, board_config;
 
-       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-       if (spec == NULL)
+       err = alloc_ad_spec(codec);
+       if (err < 0)
                return -ENOMEM;
-
-       codec->spec = spec;
+       spec = codec->spec;
 
        err = snd_hda_attach_beep_device(codec, 0x10);
        if (err < 0) {
@@ -2837,7 +2845,6 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name,
 {
        struct snd_kcontrol_new *knew;
 
-       snd_array_init(&spec->kctls, sizeof(*knew), 32);
        knew = snd_array_new(&spec->kctls);
        if (!knew)
                return -ENOMEM;
@@ -3255,11 +3262,10 @@ static int patch_ad1988(struct hda_codec *codec)
        struct ad198x_spec *spec;
        int err, board_config;
 
-       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-       if (spec == NULL)
-               return -ENOMEM;
-
-       codec->spec = spec;
+       err = alloc_ad_spec(codec);
+       if (err < 0)
+               return err;
+       spec = codec->spec;
 
        if (is_rev2(codec))
                snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n");
@@ -3575,11 +3581,10 @@ static int patch_ad1884(struct hda_codec *codec)
        struct ad198x_spec *spec;
        int err;
 
-       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-       if (spec == NULL)
-               return -ENOMEM;
-
-       codec->spec = spec;
+       err = alloc_ad_spec(codec);
+       if (err < 0)
+               return err;
+       spec = codec->spec;
 
        err = snd_hda_attach_beep_device(codec, 0x10);
        if (err < 0) {
@@ -4575,11 +4580,10 @@ static int patch_ad1884a(struct hda_codec *codec)
        struct ad198x_spec *spec;
        int err, board_config;
 
-       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-       if (spec == NULL)
-               return -ENOMEM;
-
-       codec->spec = spec;
+       err = alloc_ad_spec(codec);
+       if (err < 0)
+               return err;
+       spec = codec->spec;
 
        err = snd_hda_attach_beep_device(codec, 0x10);
        if (err < 0) {
@@ -4988,11 +4992,10 @@ static int patch_ad1882(struct hda_codec *codec)
        struct ad198x_spec *spec;
        int err, board_config;
 
-       spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-       if (spec == NULL)
-               return -ENOMEM;
-
-       codec->spec = spec;
+       err = alloc_ad_spec(codec);
+       if (err < 0)
+               return err;
+       spec = codec->spec;
 
        err = snd_hda_attach_beep_device(codec, 0x10);
        if (err < 0) {