UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: virtio: Remove #ifdef guards for PM related functions 

Use the new PM macros for the suspend and resume functions to be
automatically dropped by the compiler when CONFIG_PM or
CONFIG_PM_SLEEP are disabled, without having to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Link: https://lore.kernel.org/r/20230722115310.27681-5-paul@crapouillou.net
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
This commit is contained in:
Paul Cercueil 2023-07-22 13:53:09 +02:00 committed by Andi Shyti
parent 426b67422b
commit b221df9c4e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/busses/i2c-virtio.c
View File

@ -243,7 +243,6 @@ static struct virtio_device_id id_table[] = {
}; };
MODULE_DEVICE_TABLE(virtio, id_table); MODULE_DEVICE_TABLE(virtio, id_table);
#ifdef CONFIG_PM_SLEEP
static int virtio_i2c_freeze(struct virtio_device *vdev) static int virtio_i2c_freeze(struct virtio_device *vdev)
{ {
virtio_i2c_del_vqs(vdev); virtio_i2c_del_vqs(vdev);
@ -254,7 +253,6 @@ static int virtio_i2c_restore(struct virtio_device *vdev)
{ {
return virtio_i2c_setup_vqs(vdev->priv); return virtio_i2c_setup_vqs(vdev->priv);
} }
#endif
static const unsigned int features[] = { static const unsigned int features[] = {
VIRTIO_I2C_F_ZERO_LENGTH_REQUEST, VIRTIO_I2C_F_ZERO_LENGTH_REQUEST,
@ -269,10 +267,8 @@ static struct virtio_driver virtio_i2c_driver = {
.driver = { .driver = {
.name = "i2c_virtio", .name = "i2c_virtio",
}, },
#ifdef CONFIG_PM_SLEEP .freeze = pm_sleep_ptr(virtio_i2c_freeze),
.freeze = virtio_i2c_freeze, .restore = pm_sleep_ptr(virtio_i2c_restore),
.restore = virtio_i2c_restore,
#endif
}; };
module_virtio_driver(virtio_i2c_driver); module_virtio_driver(virtio_i2c_driver);