diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-08-02 09:51:59 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:58:24 -0400 |
commit | 12f288bffeaa3196ebd5da49c5c7ac06c6188b61 (patch) | |
tree | bce360883b1c0595574194f027807b325678a6f2 /sound/pci/hda | |
parent | 350a29b457de480ee517dbb194a934421b2e9f37 (diff) |
[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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index c4cf2c7230ef..fc934baaae65 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1325,8 +1325,7 @@ static struct snd_kcontrol_new dig_mixes[] = { | |||
1325 | * | 1325 | * |
1326 | * Returns 0 if successful, or a negative error code. | 1326 | * Returns 0 if successful, or a negative error code. |
1327 | */ | 1327 | */ |
1328 | int __devinit snd_hda_create_spdif_out_ctls(struct hda_codec *codec, | 1328 | int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid) |
1329 | hda_nid_t nid) | ||
1330 | { | 1329 | { |
1331 | int err; | 1330 | int err; |
1332 | struct snd_kcontrol *kctl; | 1331 | struct snd_kcontrol *kctl; |
@@ -1424,8 +1423,7 @@ static struct snd_kcontrol_new dig_in_ctls[] = { | |||
1424 | * | 1423 | * |
1425 | * Returns 0 if successful, or a negative error code. | 1424 | * Returns 0 if successful, or a negative error code. |
1426 | */ | 1425 | */ |
1427 | int __devinit snd_hda_create_spdif_in_ctls(struct hda_codec *codec, | 1426 | int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid) |
1428 | hda_nid_t nid) | ||
1429 | { | 1427 | { |
1430 | int err; | 1428 | int err; |
1431 | struct snd_kcontrol *kctl; | 1429 | struct snd_kcontrol *kctl; |
@@ -1895,9 +1893,9 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus) | |||
1895 | * | 1893 | * |
1896 | * If no entries are matching, the function returns a negative value. | 1894 | * If no entries are matching, the function returns a negative value. |
1897 | */ | 1895 | */ |
1898 | int __devinit snd_hda_check_board_config(struct hda_codec *codec, | 1896 | int snd_hda_check_board_config(struct hda_codec *codec, |
1899 | int num_configs, const char **models, | 1897 | int num_configs, const char **models, |
1900 | const struct snd_pci_quirk *tbl) | 1898 | const struct snd_pci_quirk *tbl) |
1901 | { | 1899 | { |
1902 | if (codec->bus->modelname && models) { | 1900 | if (codec->bus->modelname && models) { |
1903 | int i; | 1901 | int i; |
@@ -1947,8 +1945,7 @@ int __devinit snd_hda_check_board_config(struct hda_codec *codec, | |||
1947 | * | 1945 | * |
1948 | * Returns 0 if successful, or a negative error code. | 1946 | * Returns 0 if successful, or a negative error code. |
1949 | */ | 1947 | */ |
1950 | int __devinit snd_hda_add_new_ctls(struct hda_codec *codec, | 1948 | int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew) |
1951 | struct snd_kcontrol_new *knew) | ||
1952 | { | 1949 | { |
1953 | int err; | 1950 | int err; |
1954 | 1951 | ||
@@ -2224,7 +2221,7 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, | |||
2224 | * Helper for automatic ping configuration | 2221 | * Helper for automatic ping configuration |
2225 | */ | 2222 | */ |
2226 | 2223 | ||
2227 | static int __devinit is_in_nid_list(hda_nid_t nid, hda_nid_t *list) | 2224 | static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list) |
2228 | { | 2225 | { |
2229 | for (; *list; list++) | 2226 | for (; *list; list++) |
2230 | if (*list == nid) | 2227 | if (*list == nid) |
@@ -2275,9 +2272,9 @@ static void sort_pins_by_sequence(hda_nid_t * pins, short * sequences, | |||
2275 | * The digital input/output pins are assigned to dig_in_pin and dig_out_pin, | 2272 | * The digital input/output pins are assigned to dig_in_pin and dig_out_pin, |
2276 | * respectively. | 2273 | * respectively. |
2277 | */ | 2274 | */ |
2278 | int __devinit snd_hda_parse_pin_def_config(struct hda_codec *codec, | 2275 | int snd_hda_parse_pin_def_config(struct hda_codec *codec, |
2279 | struct auto_pin_cfg *cfg, | 2276 | struct auto_pin_cfg *cfg, |
2280 | hda_nid_t *ignore_nids) | 2277 | hda_nid_t *ignore_nids) |
2281 | { | 2278 | { |
2282 | hda_nid_t nid, nid_start; | 2279 | hda_nid_t nid, nid_start; |
2283 | int nodes; | 2280 | int nodes; |