Commit 0bbe50f3 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

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

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47b438cc
...@@ -1319,7 +1319,7 @@ static void tbnet_shutdown(struct tb_service *svc) ...@@ -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) ...@@ -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) ...@@ -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 = { ...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment