diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-10-14 10:40:34 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2014-10-15 10:24:54 +1030 |
| commit | 016c98c6fe0c914d12e2e242b2bccde6d6dea54b (patch) | |
| tree | 6e4fb0faa50c839cc23857954bf51f9985fb93ea /drivers/misc | |
| parent | 6fbc198cf623944ab60a1db6d306a4d55cdd820d (diff) | |
| download | blackbird-op-linux-016c98c6fe0c914d12e2e242b2bccde6d6dea54b.tar.gz blackbird-op-linux-016c98c6fe0c914d12e2e242b2bccde6d6dea54b.zip | |
virtio: unify config_changed handling
Replace duplicated code in all transports with a single wrapper in
virtio.c.
The only functional change is in virtio_mmio.c: if a buggy device sends
us an interrupt before driver is set, we previously returned IRQ_NONE,
now we return IRQ_HANDLED.
As this must not happen in practice, this does not look like a big deal.
See also commit 3fff0179e33cd7d0a688dab65700c46ad089e934
virtio-pci: do not oops on config change if driver not loaded.
for the original motivation behind the driver check.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mic/card/mic_virtio.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/misc/mic/card/mic_virtio.c b/drivers/misc/mic/card/mic_virtio.c index f14b60080c21..e64794730e21 100644 --- a/drivers/misc/mic/card/mic_virtio.c +++ b/drivers/misc/mic/card/mic_virtio.c @@ -462,16 +462,12 @@ static void mic_handle_config_change(struct mic_device_desc __iomem *d, struct mic_device_ctrl __iomem *dc = (void __iomem *)d + mic_aligned_desc_size(d); struct mic_vdev *mvdev = (struct mic_vdev *)ioread64(&dc->vdev); - struct virtio_driver *drv; if (ioread8(&dc->config_change) != MIC_VIRTIO_PARAM_CONFIG_CHANGED) return; dev_dbg(mdrv->dev, "%s %d\n", __func__, __LINE__); - drv = container_of(mvdev->vdev.dev.driver, - struct virtio_driver, driver); - if (drv->config_changed) - drv->config_changed(&mvdev->vdev); + virtio_config_changed(&mvdev->vdev); iowrite8(1, &dc->guest_ack); } |
