Commit 67a75194 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

virtio-net: mark PM functions as __maybe_unused

After removing the reset function, the freeze and restore functions
are now unused when CONFIG_PM_SLEEP is disabled:

drivers/net/virtio_net.c:1881:12: error: 'virtnet_restore_up' defined but not used [-Werror=unused-function]
 static int virtnet_restore_up(struct virtio_device *vdev)
drivers/net/virtio_net.c:1859:13: error: 'virtnet_freeze_down' defined but not used [-Werror=unused-function]
 static void virtnet_freeze_down(struct virtio_device *vdev)

A more robust way to do this is to remove the #ifdef around the callers
and instead mark them as __maybe_unused. The compiler will now just
silently drop the unused code.

Fixes: 4941d472 ("virtio-net: do not reset during XDP set")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34c8c10a
...@@ -2702,8 +2702,7 @@ static void virtnet_remove(struct virtio_device *vdev) ...@@ -2702,8 +2702,7 @@ static void virtnet_remove(struct virtio_device *vdev)
free_netdev(vi->dev); free_netdev(vi->dev);
} }
#ifdef CONFIG_PM_SLEEP static __maybe_unused int virtnet_freeze(struct virtio_device *vdev)
static int virtnet_freeze(struct virtio_device *vdev)
{ {
struct virtnet_info *vi = vdev->priv; struct virtnet_info *vi = vdev->priv;
...@@ -2714,7 +2713,7 @@ static int virtnet_freeze(struct virtio_device *vdev) ...@@ -2714,7 +2713,7 @@ static int virtnet_freeze(struct virtio_device *vdev)
return 0; return 0;
} }
static int virtnet_restore(struct virtio_device *vdev) static __maybe_unused int virtnet_restore(struct virtio_device *vdev)
{ {
struct virtnet_info *vi = vdev->priv; struct virtnet_info *vi = vdev->priv;
int err; int err;
...@@ -2730,7 +2729,6 @@ static int virtnet_restore(struct virtio_device *vdev) ...@@ -2730,7 +2729,6 @@ static int virtnet_restore(struct virtio_device *vdev)
return 0; return 0;
} }
#endif
static struct virtio_device_id id_table[] = { static struct virtio_device_id id_table[] = {
{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID }, { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
......
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