Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull virtio updates from Rusty Russell:
 "One cc: stable commit, the rest are a series of minor cleanups which
  have been sitting in MST's tree during my vacation.  I changed a
  function name and made one trivial change, then they spent two days in
  linux-next"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (25 commits)
  virtio-rng: refactor probe error handling
  virtio_scsi: drop scan callback
  virtio_balloon: enable VQs early on restore
  virtio_scsi: fix race on device removal
  virito_scsi: use freezable WQ for events
  virtio_net: enable VQs early on restore
  virtio_console: enable VQs early on restore
  virtio_scsi: enable VQs early on restore
  virtio_blk: enable VQs early on restore
  virtio_scsi: move kick event out from virtscsi_init
  virtio_net: fix use after free on allocation failure
  9p/trans_virtio: enable VQs early
  virtio_console: enable VQs early
  virtio_blk: enable VQs early
  virtio_net: enable VQs early
  virtio: add API to enable VQs early
  virtio_net: minor cleanup
  virtio-net: drop config_mutex
  virtio_net: drop config_enable
  virtio-blk: drop config_mutex
  ...

2 files changed, 2 insertions, 13 deletions

diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index a1349653c6d9..643129070c51 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -406,15 +406,8 @@ static void kvm_extint_handler(struct ext_code ext_code,
 
         switch (param) {
         case VIRTIO_PARAM_CONFIG_CHANGED:
-        {
-                struct virtio_driver *drv;
-                drv = container_of(vq->vdev->dev.driver,
-                                   struct virtio_driver, driver);
-                if (drv->config_changed)
-                        drv->config_changed(vq->vdev);
-
+                virtio_config_changed(vq->vdev);
                 break;
-        }
         case VIRTIO_PARAM_DEV_ADD:
                 schedule_work(&hotplug_work);
                 break;
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index d2c0b442bce5..6cbe6ef3c889 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -940,11 +940,7 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
                 vring_interrupt(0, vq);
         }
         if (test_bit(0, &vcdev->indicators2)) {
-                drv = container_of(vcdev->vdev.dev.driver,
-                                   struct virtio_driver, driver);
-
-                if (drv && drv->config_changed)
-                        drv->config_changed(&vcdev->vdev);
+                virtio_config_changed(&vcdev->vdev);
                 clear_bit(0, &vcdev->indicators2);
         }
 }