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>
This commit is contained in:
@@ -1536,7 +1536,7 @@ static void atc_connect_resources(struct ct_atc *atc)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int atc_suspend(struct ct_atc *atc)
|
||||
{
|
||||
int i;
|
||||
@@ -1647,7 +1647,7 @@ static struct ct_atc atc_preset __devinitdata = {
|
||||
.output_switch_put = atc_output_switch_put,
|
||||
.mic_source_switch_get = atc_mic_source_switch_get,
|
||||
.mic_source_switch_put = atc_mic_source_switch_put,
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
.suspend = atc_suspend,
|
||||
.resume = atc_resume,
|
||||
#endif
|
||||
|
@@ -143,7 +143,7 @@ struct ct_atc {
|
||||
|
||||
struct ct_timer *timer;
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
int (*suspend)(struct ct_atc *atc);
|
||||
int (*resume)(struct ct_atc *atc);
|
||||
#define NUM_PCMS (NUM_CTALSADEVS - 1)
|
||||
|
@@ -72,7 +72,7 @@ struct hw {
|
||||
int (*card_init)(struct hw *hw, struct card_conf *info);
|
||||
int (*card_stop)(struct hw *hw);
|
||||
int (*pll_init)(struct hw *hw, unsigned int rsr);
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
int (*suspend)(struct hw *hw);
|
||||
int (*resume)(struct hw *hw, struct card_conf *info);
|
||||
#endif
|
||||
|
@@ -2085,7 +2085,7 @@ static int hw_card_init(struct hw *hw, struct card_conf *info)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int hw_suspend(struct hw *hw)
|
||||
{
|
||||
struct pci_dev *pci = hw->pci;
|
||||
@@ -2180,7 +2180,7 @@ static struct hw ct20k1_preset __devinitdata = {
|
||||
.is_adc_source_selected = hw_is_adc_input_selected,
|
||||
.select_adc_source = hw_adc_input_select,
|
||||
.capabilities = hw_capabilities,
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
.suspend = hw_suspend,
|
||||
.resume = hw_resume,
|
||||
#endif
|
||||
|
@@ -2201,7 +2201,7 @@ static int hw_card_init(struct hw *hw, struct card_conf *info)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int hw_suspend(struct hw *hw)
|
||||
{
|
||||
struct pci_dev *pci = hw->pci;
|
||||
@@ -2250,7 +2250,7 @@ static struct hw ct20k2_preset __devinitdata = {
|
||||
.output_switch_put = hw_output_switch_put,
|
||||
.mic_source_switch_get = hw_mic_source_switch_get,
|
||||
.mic_source_switch_put = hw_mic_source_switch_put,
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
.suspend = hw_suspend,
|
||||
.resume = hw_resume,
|
||||
#endif
|
||||
|
@@ -1118,7 +1118,7 @@ mixer_set_input_right(struct ct_mixer *mixer,
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int mixer_resume(struct ct_mixer *mixer)
|
||||
{
|
||||
int i, state;
|
||||
@@ -1188,7 +1188,7 @@ int ct_mixer_create(struct ct_atc *atc, struct ct_mixer **rmixer)
|
||||
mixer->get_output_ports = mixer_get_output_ports;
|
||||
mixer->set_input_left = mixer_set_input_left;
|
||||
mixer->set_input_right = mixer_set_input_right;
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
mixer->resume = mixer_resume;
|
||||
#endif
|
||||
|
||||
|
@@ -56,7 +56,7 @@ struct ct_mixer {
|
||||
enum MIXER_PORT_T type, struct rsc *rsc);
|
||||
int (*set_input_right)(struct ct_mixer *mixer,
|
||||
enum MIXER_PORT_T type, struct rsc *rsc);
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
int (*resume)(struct ct_mixer *mixer);
|
||||
#endif
|
||||
};
|
||||
|
@@ -427,7 +427,7 @@ int ct_alsa_pcm_create(struct ct_atc *atc,
|
||||
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
|
||||
snd_dma_pci_data(atc->pci), 128*1024, 128*1024);
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
atc->pcms[device] = pcm;
|
||||
#endif
|
||||
|
||||
|
@@ -125,7 +125,7 @@ static void __devexit ct_card_remove(struct pci_dev *pci)
|
||||
pci_set_drvdata(pci, NULL);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int ct_card_suspend(struct device *dev)
|
||||
{
|
||||
struct snd_card *card = dev_get_drvdata(dev);
|
||||
|
Reference in New Issue
Block a user