Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12f288bf authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-intel - Remove invalid __devinit 



Some functions in hda_codec.c are called from patch ops, which are
kept in the codec instance even after initialization.  Thus they
shouldn't be marked as __devinit.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 350a29b4

sound/pci/hda/hda_codec.c

+10 −13
Original line number Diff line number Diff line
@@ -1325,8 +1325,7 @@ static struct snd_kcontrol_new dig_mixes[] = { 
 *

 * Returns 0 if successful, or a negative error code.

 */

int __devinit snd_hda_create_spdif_out_ctls(struct hda_codec *codec,

					    hda_nid_t nid)

int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)

{

	int err;

	struct snd_kcontrol *kctl;
@@ -1424,8 +1423,7 @@ static struct snd_kcontrol_new dig_in_ctls[] = { 
 *

 * Returns 0 if successful, or a negative error code.

 */

int __devinit snd_hda_create_spdif_in_ctls(struct hda_codec *codec,

					   hda_nid_t nid)

int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)

{

	int err;

	struct snd_kcontrol *kctl;
@@ -1895,7 +1893,7 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus) 
 *

 * If no entries are matching, the function returns a negative value.

 */

int __devinit snd_hda_check_board_config(struct hda_codec *codec,

int snd_hda_check_board_config(struct hda_codec *codec,

			       int num_configs, const char **models,

			       const struct snd_pci_quirk *tbl)

{
@@ -1947,8 +1945,7 @@ int __devinit snd_hda_check_board_config(struct hda_codec *codec, 
 *

 * Returns 0 if successful, or a negative error code.

 */

int __devinit snd_hda_add_new_ctls(struct hda_codec *codec,

				   struct snd_kcontrol_new *knew)

int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)

{

	int err;
@@ -2224,7 +2221,7 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, 
 * Helper for automatic ping configuration

 */



static int __devinit is_in_nid_list(hda_nid_t nid, hda_nid_t *list)

static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)

{

	for (; *list; list++)

		if (*list == nid)
@@ -2275,7 +2272,7 @@ static void sort_pins_by_sequence(hda_nid_t * pins, short * sequences, 
 * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,

 * respectively.

 */

int __devinit snd_hda_parse_pin_def_config(struct hda_codec *codec,

int snd_hda_parse_pin_def_config(struct hda_codec *codec,

				 struct auto_pin_cfg *cfg,

				 hda_nid_t *ignore_nids)

{