public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: oxygen: Convert to EXPORT_SIMPLE_DEV_PM_OPS()

Browse source 
Use the newer EXPORT_SIMPLE_DEV_PM_OPS() macro instead of
SIPLE_DEV_PM_OPS() and manual export, together with pm_ptr() macro,
which makes CONFIG_PM_SLEEP ifdefs superfluous.

Merely a cleanup, there should be no actual code change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250313170731.26943-8-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-03-13 18:07:25 +01:00
parent f923335da9
commit 5ea0a2206b
5 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/pci/oxygen/oxygen.c
View file

@ -854,11 +854,9 @@ static struct pci_driver oxygen_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = oxygen_ids, .id_table = oxygen_ids,
.probe = generic_oxygen_probe, .probe = generic_oxygen_probe,
#ifdef CONFIG_PM_SLEEP
.driver = { .driver = {
.pm = &oxygen_pci_pm, .pm = pm_ptr(&oxygen_pci_pm),
}, },
#endif
}; };
module_pci_driver(oxygen_driver); module_pci_driver(oxygen_driver);

2
sound/pci/oxygen/oxygen.h
View file

@ -161,9 +161,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
const struct pci_device_id *id const struct pci_device_id *id
) )
); );
#ifdef CONFIG_PM_SLEEP
extern const struct dev_pm_ops oxygen_pci_pm; extern const struct dev_pm_ops oxygen_pci_pm;
#endif
void oxygen_pci_shutdown(struct pci_dev *pci); void oxygen_pci_shutdown(struct pci_dev *pci);
/* oxygen_mixer.c */ /* oxygen_mixer.c */

5
sound/pci/oxygen/oxygen_lib.c
View file

@ -713,7 +713,6 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
} }
EXPORT_SYMBOL(oxygen_pci_probe); EXPORT_SYMBOL(oxygen_pci_probe);
#ifdef CONFIG_PM_SLEEP
static int oxygen_pci_suspend(struct device *dev) static int oxygen_pci_suspend(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
@ -789,9 +788,7 @@ static int oxygen_pci_resume(struct device *dev)
return 0; return 0;
} }
SIMPLE_DEV_PM_OPS(oxygen_pci_pm, oxygen_pci_suspend, oxygen_pci_resume); EXPORT_SIMPLE_DEV_PM_OPS(oxygen_pci_pm, oxygen_pci_suspend, oxygen_pci_resume);
EXPORT_SYMBOL(oxygen_pci_pm);
#endif /* CONFIG_PM_SLEEP */
void oxygen_pci_shutdown(struct pci_dev *pci) void oxygen_pci_shutdown(struct pci_dev *pci)
{ {

4
sound/pci/oxygen/se6x.c
View file

@ -137,11 +137,9 @@ static struct pci_driver se6x_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = se6x_ids, .id_table = se6x_ids,
.probe = se6x_probe, .probe = se6x_probe,
#ifdef CONFIG_PM_SLEEP
.driver = { .driver = {
.pm = &oxygen_pci_pm, .pm = pm_ptr(&oxygen_pci_pm),
}, },
#endif
.shutdown = oxygen_pci_shutdown, .shutdown = oxygen_pci_shutdown,
}; };

4
sound/pci/oxygen/virtuoso.c
View file

@ -82,11 +82,9 @@ static struct pci_driver xonar_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = xonar_ids, .id_table = xonar_ids,
.probe = xonar_probe, .probe = xonar_probe,
#ifdef CONFIG_PM_SLEEP
.driver = { .driver = {
.pm = &oxygen_pci_pm, .pm = pm_ptr(&oxygen_pci_pm),
}, },
#endif
.shutdown = oxygen_pci_shutdown, .shutdown = oxygen_pci_shutdown,
}; };