Commit b221df9c authored by Paul Cercueil's avatar Paul Cercueil Committed by Andi Shyti
Browse files

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: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Link: https://lore.kernel.org/r/20230722115310.27681-5-paul@crapouillou.net


Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 426b6742

drivers/i2c/busses/i2c-virtio.c

+2 −6
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ static struct virtio_device_id id_table[] = { 
};

MODULE_DEVICE_TABLE(virtio, id_table);



#ifdef CONFIG_PM_SLEEP

static int virtio_i2c_freeze(struct virtio_device *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);

}

#endif



static const unsigned int features[] = {

	VIRTIO_I2C_F_ZERO_LENGTH_REQUEST,
@@ -269,10 +267,8 @@ static struct virtio_driver virtio_i2c_driver = { 
	.driver			= {

		.name	= "i2c_virtio",

	},

#ifdef CONFIG_PM_SLEEP

	.freeze = virtio_i2c_freeze,

	.restore = virtio_i2c_restore,

#endif

	.freeze			= pm_sleep_ptr(virtio_i2c_freeze),

	.restore		= pm_sleep_ptr(virtio_i2c_restore),

};

module_virtio_driver(virtio_i2c_driver);