iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: thunderbolt: Switch from __maybe_unused to pm_sleep_ptr() etc

Browse Source 
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less heavier for builds
than the use of __maybe_unused attributes.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy Shevchenko 2022-11-30 14:36:12 +02:00 committed by David S. Miller
parent 47b438cc27
commit 0bbe50f3e8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/thunderbolt.c
View File

@ -1319,7 +1319,7 @@ static void tbnet_shutdown(struct tb_service *svc)
tbnet_tear_down(tb_service_get_drvdata(svc), true); tbnet_tear_down(tb_service_get_drvdata(svc), true);
} }
static int __maybe_unused tbnet_suspend(struct device *dev) static int tbnet_suspend(struct device *dev)
{ {
struct tb_service *svc = tb_to_service(dev); struct tb_service *svc = tb_to_service(dev);
struct tbnet *net = tb_service_get_drvdata(svc); struct tbnet *net = tb_service_get_drvdata(svc);
@ -1334,7 +1334,7 @@ static int __maybe_unused tbnet_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused tbnet_resume(struct device *dev) static int tbnet_resume(struct device *dev)
{ {
struct tb_service *svc = tb_to_service(dev); struct tb_service *svc = tb_to_service(dev);
struct tbnet *net = tb_service_get_drvdata(svc); struct tbnet *net = tb_service_get_drvdata(svc);
@ -1350,9 +1350,7 @@ static int __maybe_unused tbnet_resume(struct device *dev)
return 0; return 0;
} }
static const struct dev_pm_ops tbnet_pm_ops = { static DEFINE_SIMPLE_DEV_PM_OPS(tbnet_pm_ops, tbnet_suspend, tbnet_resume);
SET_SYSTEM_SLEEP_PM_OPS(tbnet_suspend, tbnet_resume)
};
static const struct tb_service_id tbnet_ids[] = { static const struct tb_service_id tbnet_ids[] = {
{ TB_SERVICE("network", 1) }, { TB_SERVICE("network", 1) },
@ -1364,7 +1362,7 @@ static struct tb_service_driver tbnet_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "thunderbolt-net", .name = "thunderbolt-net",
.pm = &tbnet_pm_ops, .pm = pm_sleep_ptr(&tbnet_pm_ops),
}, },
.probe = tbnet_probe, .probe = tbnet_probe,
.remove = tbnet_remove, .remove = tbnet_remove,