mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
hwrng: virtio - remove #ifdef guards for PM functions
Use pm_sleep_ptr for the freeze and restore functions instead of putting them under #ifdef CONFIG_PM_SLEEP. The resulting code is slightly simpler. pm_sleep_ptr lets the compiler see the functions but also allows removing them as unused code if !CONFIG_PM_SLEEP. Signed-off-by: Martin Kaiser <martin@kaiser.cx> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
d57343022b
commit
7c18e3c6b3
1 changed files with 2 additions and 6 deletions
|
@ -208,7 +208,6 @@ static void virtrng_scan(struct virtio_device *vdev)
|
|||
vi->hwrng_register_done = true;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int virtrng_freeze(struct virtio_device *vdev)
|
||||
{
|
||||
remove_common(vdev);
|
||||
|
@ -238,7 +237,6 @@ static int virtrng_restore(struct virtio_device *vdev)
|
|||
|
||||
return err;
|
||||
}
|
||||
#endif
|
||||
|
||||
static const struct virtio_device_id id_table[] = {
|
||||
{ VIRTIO_ID_RNG, VIRTIO_DEV_ANY_ID },
|
||||
|
@ -252,10 +250,8 @@ static struct virtio_driver virtio_rng_driver = {
|
|||
.probe = virtrng_probe,
|
||||
.remove = virtrng_remove,
|
||||
.scan = virtrng_scan,
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
.freeze = virtrng_freeze,
|
||||
.restore = virtrng_restore,
|
||||
#endif
|
||||
.freeze = pm_sleep_ptr(virtrng_freeze),
|
||||
.restore = pm_sleep_ptr(virtrng_restore),
|
||||
};
|
||||
|
||||
module_virtio_driver(virtio_rng_driver);
|
||||
|
|
Loading…
Reference in a new issue