kevin/linux
1
Fork 0
Code

ALSA: atiixp: Replace with DEFINE_SIMPLE_DEV_PM_OPS()

Browse Source 
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:
Takashi Iwai 2024-02-07 16:51:17 +01:00
parent 8cd4a3b221
commit b462d0b9e3
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/pci/atiixp.c
View File

@ -520,7 +520,6 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int snd_atiixp_aclink_down(struct atiixp *chip) static int snd_atiixp_aclink_down(struct atiixp *chip)
{ {
// if (atiixp_read(chip, MODEM_MIRROR) & 0x1) /* modem running, too? */ // 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); ATI_REG_CMD_POWERDOWN);
return 0; return 0;
} }
#endif
/* /*
* auto-detection of codecs * 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 * power management
*/ */
@ -1499,12 +1496,7 @@ static int snd_atiixp_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume); static DEFINE_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 */
/* /*
* proc interface for register dump * proc interface for register dump
@ -1634,7 +1626,7 @@ static struct pci_driver atiixp_driver = {
.id_table = snd_atiixp_ids, .id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe, .probe = snd_atiixp_probe,
.driver = { .driver = {
.pm = SND_ATIIXP_PM_OPS, .pm = &snd_atiixp_pm,
}, },
}; };

11
sound/pci/atiixp_modem.c
View File

@ -496,7 +496,6 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int snd_atiixp_aclink_down(struct atiixp_modem *chip) static int snd_atiixp_aclink_down(struct atiixp_modem *chip)
{ {
// if (atiixp_read(chip, MODEM_MIRROR) & 0x1) /* modem running, too? */ // 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); ATI_REG_CMD_POWERDOWN);
return 0; return 0;
} }
#endif
/* /*
* auto-detection of codecs * 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 * power management
*/ */
@ -1128,11 +1125,7 @@ static int snd_atiixp_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume); static DEFINE_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 */
/* /*
* proc interface for register dump * proc interface for register dump
@ -1258,7 +1251,7 @@ static struct pci_driver atiixp_modem_driver = {
.id_table = snd_atiixp_ids, .id_table = snd_atiixp_ids,
.probe = snd_atiixp_probe, .probe = snd_atiixp_probe,
.driver = { .driver = {
.pm = SND_ATIIXP_PM_OPS, .pm = &snd_atiixp_pm,
}, },
}; };