From 3f05c6dd1307884bfae727da2a198f745d50d031 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 30 Jul 2022 15:34:05 +0200 Subject: [PATCH] ANDROID: fix up 5.10.132 merge with the virtio_mmio.c driver The merge of 5.10.132 into the android12-5.10-lts branch caused duplicate functions to be merged into the same file. Fix this up by removing the out-of-tree versions and accepting the versions that came in as part of 5.10.132 Fixes: 0c724b692df3 ("Merge 5.10.132 into android12-5.10-lts") Signed-off-by: Greg Kroah-Hartman Change-Id: I3d4770e22d4e96b07e1e1d0f312f6fa4bb440e59 --- drivers/virtio/virtio_mmio.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 5cb8045a27aa..e8ef0c66e558 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -787,26 +787,6 @@ static void vm_unregister_cmdline_devices(void) #endif -#ifdef CONFIG_PM_SLEEP -static int virtio_mmio_freeze(struct device *dev) -{ - struct platform_device *pdev = to_platform_device(dev); - struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev); - - return virtio_device_freeze(&vm_dev->vdev); -} - -static int virtio_mmio_restore(struct device *dev) -{ - struct platform_device *pdev = to_platform_device(dev); - struct virtio_mmio_device *vm_dev = platform_get_drvdata(pdev); - - return virtio_device_restore(&vm_dev->vdev); -} -#endif - -static SIMPLE_DEV_PM_OPS(virtio_mmio_pm_ops, virtio_mmio_freeze, virtio_mmio_restore); - /* Platform driver */ static const struct of_device_id virtio_mmio_match[] = {