xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: fix up 5.10.132 merge with the virtio_mmio.c driver

Browse Source 
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: 0c724b692d ("Merge 5.10.132 into android12-5.10-lts")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3d4770e22d4e96b07e1e1d0f312f6fa4bb440e59
This commit is contained in:
Greg Kroah-Hartman
2022-07-30 15:34:05 +02:00
parent bbc03f7ab8
commit 3f05c6dd13
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/virtio/virtio_mmio.c
View File

@@ -787,26 +787,6 @@ static void vm_unregister_cmdline_devices(void)
#endif #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 */ /* Platform driver */
static const struct of_device_id virtio_mmio_match[] = { static const struct of_device_id virtio_mmio_match[] = {