diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-14 12:12:04 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-14 12:12:04 -0400 |
commit | c7561cd80469f2fe4a6be0984db57832ee7f2a3b (patch) | |
tree | 02ce843b7caed4d41ef6d17450e6b05b96c94952 /sound/pci/ctxfi | |
parent | 7ccbde57ce312ff1388c2990699f8863280808ac (diff) |
ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP
Otherwise we may get compile warnings due to unused functions.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi')
-rw-r--r-- | sound/pci/ctxfi/ctatc.c | 4 | ||||
-rw-r--r-- | sound/pci/ctxfi/ctatc.h | 2 | ||||
-rw-r--r-- | sound/pci/ctxfi/cthardware.h | 2 | ||||
-rw-r--r-- | sound/pci/ctxfi/cthw20k1.c | 4 | ||||
-rw-r--r-- | sound/pci/ctxfi/cthw20k2.c | 4 | ||||
-rw-r--r-- | sound/pci/ctxfi/ctmixer.c | 4 | ||||
-rw-r--r-- | sound/pci/ctxfi/ctmixer.h | 2 | ||||
-rw-r--r-- | sound/pci/ctxfi/ctpcm.c | 2 | ||||
-rw-r--r-- | sound/pci/ctxfi/xfi.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index 8e40262d4117..58b235c46e86 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c | |||
@@ -1536,7 +1536,7 @@ static void atc_connect_resources(struct ct_atc *atc) | |||
1536 | } | 1536 | } |
1537 | } | 1537 | } |
1538 | 1538 | ||
1539 | #ifdef CONFIG_PM | 1539 | #ifdef CONFIG_PM_SLEEP |
1540 | static int atc_suspend(struct ct_atc *atc) | 1540 | static int atc_suspend(struct ct_atc *atc) |
1541 | { | 1541 | { |
1542 | int i; | 1542 | int i; |
@@ -1647,7 +1647,7 @@ static struct ct_atc atc_preset __devinitdata = { | |||
1647 | .output_switch_put = atc_output_switch_put, | 1647 | .output_switch_put = atc_output_switch_put, |
1648 | .mic_source_switch_get = atc_mic_source_switch_get, | 1648 | .mic_source_switch_get = atc_mic_source_switch_get, |
1649 | .mic_source_switch_put = atc_mic_source_switch_put, | 1649 | .mic_source_switch_put = atc_mic_source_switch_put, |
1650 | #ifdef CONFIG_PM | 1650 | #ifdef CONFIG_PM_SLEEP |
1651 | .suspend = atc_suspend, | 1651 | .suspend = atc_suspend, |
1652 | .resume = atc_resume, | 1652 | .resume = atc_resume, |
1653 | #endif | 1653 | #endif |
diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h index 653e813ad142..69b51f9d345e 100644 --- a/sound/pci/ctxfi/ctatc.h +++ b/sound/pci/ctxfi/ctatc.h | |||
@@ -143,7 +143,7 @@ struct ct_atc { | |||
143 | 143 | ||
144 | struct ct_timer *timer; | 144 | struct ct_timer *timer; |
145 | 145 | ||
146 | #ifdef CONFIG_PM | 146 | #ifdef CONFIG_PM_SLEEP |
147 | int (*suspend)(struct ct_atc *atc); | 147 | int (*suspend)(struct ct_atc *atc); |
148 | int (*resume)(struct ct_atc *atc); | 148 | int (*resume)(struct ct_atc *atc); |
149 | #define NUM_PCMS (NUM_CTALSADEVS - 1) | 149 | #define NUM_PCMS (NUM_CTALSADEVS - 1) |
diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h index c56fe533b3f3..5977e9a24b5c 100644 --- a/sound/pci/ctxfi/cthardware.h +++ b/sound/pci/ctxfi/cthardware.h | |||
@@ -72,7 +72,7 @@ struct hw { | |||
72 | int (*card_init)(struct hw *hw, struct card_conf *info); | 72 | int (*card_init)(struct hw *hw, struct card_conf *info); |
73 | int (*card_stop)(struct hw *hw); | 73 | int (*card_stop)(struct hw *hw); |
74 | int (*pll_init)(struct hw *hw, unsigned int rsr); | 74 | int (*pll_init)(struct hw *hw, unsigned int rsr); |
75 | #ifdef CONFIG_PM | 75 | #ifdef CONFIG_PM_SLEEP |
76 | int (*suspend)(struct hw *hw); | 76 | int (*suspend)(struct hw *hw); |
77 | int (*resume)(struct hw *hw, struct card_conf *info); | 77 | int (*resume)(struct hw *hw, struct card_conf *info); |
78 | #endif | 78 | #endif |
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c index dc1969bc67d4..4507f7088b24 100644 --- a/sound/pci/ctxfi/cthw20k1.c +++ b/sound/pci/ctxfi/cthw20k1.c | |||
@@ -2085,7 +2085,7 @@ static int hw_card_init(struct hw *hw, struct card_conf *info) | |||
2085 | return 0; | 2085 | return 0; |
2086 | } | 2086 | } |
2087 | 2087 | ||
2088 | #ifdef CONFIG_PM | 2088 | #ifdef CONFIG_PM_SLEEP |
2089 | static int hw_suspend(struct hw *hw) | 2089 | static int hw_suspend(struct hw *hw) |
2090 | { | 2090 | { |
2091 | struct pci_dev *pci = hw->pci; | 2091 | struct pci_dev *pci = hw->pci; |
@@ -2180,7 +2180,7 @@ static struct hw ct20k1_preset __devinitdata = { | |||
2180 | .is_adc_source_selected = hw_is_adc_input_selected, | 2180 | .is_adc_source_selected = hw_is_adc_input_selected, |
2181 | .select_adc_source = hw_adc_input_select, | 2181 | .select_adc_source = hw_adc_input_select, |
2182 | .capabilities = hw_capabilities, | 2182 | .capabilities = hw_capabilities, |
2183 | #ifdef CONFIG_PM | 2183 | #ifdef CONFIG_PM_SLEEP |
2184 | .suspend = hw_suspend, | 2184 | .suspend = hw_suspend, |
2185 | .resume = hw_resume, | 2185 | .resume = hw_resume, |
2186 | #endif | 2186 | #endif |
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c index 9d1231dc4ae2..b9c9349058bc 100644 --- a/sound/pci/ctxfi/cthw20k2.c +++ b/sound/pci/ctxfi/cthw20k2.c | |||
@@ -2201,7 +2201,7 @@ static int hw_card_init(struct hw *hw, struct card_conf *info) | |||
2201 | return 0; | 2201 | return 0; |
2202 | } | 2202 | } |
2203 | 2203 | ||
2204 | #ifdef CONFIG_PM | 2204 | #ifdef CONFIG_PM_SLEEP |
2205 | static int hw_suspend(struct hw *hw) | 2205 | static int hw_suspend(struct hw *hw) |
2206 | { | 2206 | { |
2207 | struct pci_dev *pci = hw->pci; | 2207 | struct pci_dev *pci = hw->pci; |
@@ -2250,7 +2250,7 @@ static struct hw ct20k2_preset __devinitdata = { | |||
2250 | .output_switch_put = hw_output_switch_put, | 2250 | .output_switch_put = hw_output_switch_put, |
2251 | .mic_source_switch_get = hw_mic_source_switch_get, | 2251 | .mic_source_switch_get = hw_mic_source_switch_get, |
2252 | .mic_source_switch_put = hw_mic_source_switch_put, | 2252 | .mic_source_switch_put = hw_mic_source_switch_put, |
2253 | #ifdef CONFIG_PM | 2253 | #ifdef CONFIG_PM_SLEEP |
2254 | .suspend = hw_suspend, | 2254 | .suspend = hw_suspend, |
2255 | .resume = hw_resume, | 2255 | .resume = hw_resume, |
2256 | #endif | 2256 | #endif |
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c index 0cc13eeef8da..48fe0e39c2be 100644 --- a/sound/pci/ctxfi/ctmixer.c +++ b/sound/pci/ctxfi/ctmixer.c | |||
@@ -1118,7 +1118,7 @@ mixer_set_input_right(struct ct_mixer *mixer, | |||
1118 | return 0; | 1118 | return 0; |
1119 | } | 1119 | } |
1120 | 1120 | ||
1121 | #ifdef CONFIG_PM | 1121 | #ifdef CONFIG_PM_SLEEP |
1122 | static int mixer_resume(struct ct_mixer *mixer) | 1122 | static int mixer_resume(struct ct_mixer *mixer) |
1123 | { | 1123 | { |
1124 | int i, state; | 1124 | int i, state; |
@@ -1188,7 +1188,7 @@ int ct_mixer_create(struct ct_atc *atc, struct ct_mixer **rmixer) | |||
1188 | mixer->get_output_ports = mixer_get_output_ports; | 1188 | mixer->get_output_ports = mixer_get_output_ports; |
1189 | mixer->set_input_left = mixer_set_input_left; | 1189 | mixer->set_input_left = mixer_set_input_left; |
1190 | mixer->set_input_right = mixer_set_input_right; | 1190 | mixer->set_input_right = mixer_set_input_right; |
1191 | #ifdef CONFIG_PM | 1191 | #ifdef CONFIG_PM_SLEEP |
1192 | mixer->resume = mixer_resume; | 1192 | mixer->resume = mixer_resume; |
1193 | #endif | 1193 | #endif |
1194 | 1194 | ||
diff --git a/sound/pci/ctxfi/ctmixer.h b/sound/pci/ctxfi/ctmixer.h index b009e989e77d..be881c639fee 100644 --- a/sound/pci/ctxfi/ctmixer.h +++ b/sound/pci/ctxfi/ctmixer.h | |||
@@ -56,7 +56,7 @@ struct ct_mixer { | |||
56 | enum MIXER_PORT_T type, struct rsc *rsc); | 56 | enum MIXER_PORT_T type, struct rsc *rsc); |
57 | int (*set_input_right)(struct ct_mixer *mixer, | 57 | int (*set_input_right)(struct ct_mixer *mixer, |
58 | enum MIXER_PORT_T type, struct rsc *rsc); | 58 | enum MIXER_PORT_T type, struct rsc *rsc); |
59 | #ifdef CONFIG_PM | 59 | #ifdef CONFIG_PM_SLEEP |
60 | int (*resume)(struct ct_mixer *mixer); | 60 | int (*resume)(struct ct_mixer *mixer); |
61 | #endif | 61 | #endif |
62 | }; | 62 | }; |
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c index 2c8622617c8c..d021876901bb 100644 --- a/sound/pci/ctxfi/ctpcm.c +++ b/sound/pci/ctxfi/ctpcm.c | |||
@@ -427,7 +427,7 @@ int ct_alsa_pcm_create(struct ct_atc *atc, | |||
427 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, | 427 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG, |
428 | snd_dma_pci_data(atc->pci), 128*1024, 128*1024); | 428 | snd_dma_pci_data(atc->pci), 128*1024, 128*1024); |
429 | 429 | ||
430 | #ifdef CONFIG_PM | 430 | #ifdef CONFIG_PM_SLEEP |
431 | atc->pcms[device] = pcm; | 431 | atc->pcms[device] = pcm; |
432 | #endif | 432 | #endif |
433 | 433 | ||
diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c index e002183ef8b2..07c07d752fd8 100644 --- a/sound/pci/ctxfi/xfi.c +++ b/sound/pci/ctxfi/xfi.c | |||
@@ -125,7 +125,7 @@ static void __devexit ct_card_remove(struct pci_dev *pci) | |||
125 | pci_set_drvdata(pci, NULL); | 125 | pci_set_drvdata(pci, NULL); |
126 | } | 126 | } |
127 | 127 | ||
128 | #ifdef CONFIG_PM | 128 | #ifdef CONFIG_PM_SLEEP |
129 | static int ct_card_suspend(struct device *dev) | 129 | static int ct_card_suspend(struct device *dev) |
130 | { | 130 | { |
131 | struct snd_card *card = dev_get_drvdata(dev); | 131 | struct snd_card *card = dev_get_drvdata(dev); |