ALSA: atiixp: Replace with DEFINE_SIMPLE_DEV_PM_OPS()
Use the new DEFINE_SIMPLE_DEV_PM_OPS() instead of SIMPLE_DEV_PM_OPS() for code-simplification. We need no longer CONFIG_PM_SLEEP ifdefs. Just a cleanup, no functional changes. Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://lore.kernel.org/r/20240207155140.18238-7-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
8cd4a3b221
commit
b462d0b9e3
@ -520,7 +520,6 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int snd_atiixp_aclink_down(struct atiixp *chip)
|
||||
{
|
||||
// if (atiixp_read(chip, MODEM_MIRROR) & 0x1) /* modem running, too? */
|
||||
@ -530,7 +529,6 @@ static int snd_atiixp_aclink_down(struct atiixp *chip)
|
||||
ATI_REG_CMD_POWERDOWN);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* auto-detection of codecs
|
||||
@ -1454,7 +1452,6 @@ static int snd_atiixp_mixer_new(struct atiixp *chip, int clock,
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
/*
|
||||
* power management
|
||||
*/
|
||||
@ -1499,12 +1496,7 @@ static int snd_atiixp_resume(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
|
||||
#define SND_ATIIXP_PM_OPS &snd_atiixp_pm
|
||||
#else
|
||||
#define SND_ATIIXP_PM_OPS NULL
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
|
||||
|
||||
/*
|
||||
* proc interface for register dump
|
||||
@ -1634,7 +1626,7 @@ static struct pci_driver atiixp_driver = {
|
||||
.id_table = snd_atiixp_ids,
|
||||
.probe = snd_atiixp_probe,
|
||||
.driver = {
|
||||
.pm = SND_ATIIXP_PM_OPS,
|
||||
.pm = &snd_atiixp_pm,
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -496,7 +496,6 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int snd_atiixp_aclink_down(struct atiixp_modem *chip)
|
||||
{
|
||||
// if (atiixp_read(chip, MODEM_MIRROR) & 0x1) /* modem running, too? */
|
||||
@ -506,7 +505,6 @@ static int snd_atiixp_aclink_down(struct atiixp_modem *chip)
|
||||
ATI_REG_CMD_POWERDOWN);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* auto-detection of codecs
|
||||
@ -1094,7 +1092,6 @@ static int snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock)
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
/*
|
||||
* power management
|
||||
*/
|
||||
@ -1128,11 +1125,7 @@ static int snd_atiixp_resume(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
|
||||
#define SND_ATIIXP_PM_OPS &snd_atiixp_pm
|
||||
#else
|
||||
#define SND_ATIIXP_PM_OPS NULL
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
|
||||
|
||||
/*
|
||||
* proc interface for register dump
|
||||
@ -1258,7 +1251,7 @@ static struct pci_driver atiixp_modem_driver = {
|
||||
.id_table = snd_atiixp_ids,
|
||||
.probe = snd_atiixp_probe,
|
||||
.driver = {
|
||||
.pm = SND_ATIIXP_PM_OPS,
|
||||
.pm = &snd_atiixp_pm,
|
||||
},
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user