diff mbox series

[SRU,Focal:linux-intel-iotg-5.15,1/2] mei: backport fix from 5.12

Message ID 20220509090606.38946-2-jianhui.lee@canonical.com
State New
Headers show
Series Enable Intel Management Engine Interface | expand

Commit Message

Jian Hui Lee May 9, 2022, 9:06 a.m. UTC 
From: Zhou Furong <furong.zhou@intel.com>

BugLink: https://bugs.launchpad.net/bugs/1945464

virtio_config_disable/virtio_config_enable removed.

Signed-off-by: Anthony Wong <anthony.wong@canonical.com>
Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
(cherry picked from commit 1a705379b14fe6f8bd8101347553044fafc30752 linux-intel-5.13)
Signed-off-by: Jian Hui Lee <jianhui.lee@canonical.com>
---
 drivers/misc/mei/dal/dal_class.c | 6 ++----
 drivers/misc/mei/hw-virtio.c     | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/drivers/misc/mei/dal/dal_class.c b/drivers/misc/mei/dal/dal_class.c
index 27f6ffb9153d..478d6b45f947 100644
--- a/drivers/misc/mei/dal/dal_class.c
+++ b/drivers/misc/mei/dal/dal_class.c
@@ -652,7 +652,7 @@  struct device *dal_find_dev(enum dal_dev_type device_id)
  *
  * Return: 0
  */
-static int dal_remove(struct mei_cl_device *cldev)
+static void dal_remove(struct mei_cl_device *cldev)
 {
 	struct dal_device *ddev = mei_cldev_get_drvdata(cldev);
 	struct dal_client *dc;
@@ -660,7 +660,7 @@  static int dal_remove(struct mei_cl_device *cldev)
 	unsigned int i;
 
 	if (!ddev)
-		return 0;
+		return;
 
 	dal_dev_del(ddev);
 
@@ -682,8 +682,6 @@  static int dal_remove(struct mei_cl_device *cldev)
 	device_unregister(&ddev->dev);
 
 	mei_cldev_disable(cldev);
-
-	return 0;
 }
 
 /**
diff --git a/drivers/misc/mei/hw-virtio.c b/drivers/misc/mei/hw-virtio.c
index 899dc1c5e7ca..a38ac6ff4f7f 100644
--- a/drivers/misc/mei/hw-virtio.c
+++ b/drivers/misc/mei/hw-virtio.c
@@ -175,8 +175,6 @@  static void mei_virtio_intr_enable(struct mei_device *dev)
 	struct mei_virtio_hw *hw = to_virtio_hw(dev);
 	struct virtio_device *vdev = dev_to_virtio(dev->dev);
 
-	virtio_config_enable(vdev);
-
 	virtqueue_enable_cb(hw->in);
 	virtqueue_enable_cb(hw->out);
 }
@@ -191,8 +189,6 @@  static void mei_virtio_intr_disable(struct mei_device *dev)
 	struct mei_virtio_hw *hw = to_virtio_hw(dev);
 	struct virtio_device *vdev = dev_to_virtio(dev->dev);
 
-	virtio_config_disable(vdev);
-
 	virtqueue_disable_cb(hw->in);
 	virtqueue_disable_cb(hw->out);
 }