virtio_mmio: remove virtio_mmio_vq_info
PATCH 1/1 virtio_mmio: remove virtio_mmio_vq_info
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/virtio/virtio_mmio.c | 52 ++++---------------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-)
drivers/virtio/virtio_mmio.c +4 -48
@@ -89,22 +89,8 @@ struct virtio_mmio_device {void __iomem *base;unsigned long version; - -/* a list of queues so we can dispatch IRQs */ -spinlock_t lock; -struct list_head virtqueues; -}; - -struct virtio_mmio_vq_info { -/* the actual virtqueue */ -struct virtqueue *vq; - -/* the list node for the virtqueues list */ -struct list_head node; }; - -/* Configuration interface */ static u64 vm_get_features (struct virtio_device *vdev)
@@ -286,9 +272,7 @@ static bool vm_notify(struct virtqueue *vq)static irqreturn_t vm_interrupt (int irq,void *opaque) {struct virtio_mmio_device *vm_dev = opaque; -struct virtio_mmio_vq_info *info;unsigned long status; -unsigned long flags;irqreturn_t ret =IRQ_NONE ;/* Read and acknowledge interrupts */
@@ -301,10 +285,10 @@ static irqreturn_t vm_interrupt(int irq, void *opaque) }if (likely (status &VIRTIO_MMIO_INT_VRING )) { -spin_lock_irqsave (&vm_dev->lock, flags); -list_for_each_entry (info, &vm_dev->virtqueues, node) - ret |=vring_interrupt (irq, info->vq); -spin_unlock_irqrestore (&vm_dev->lock, flags); +struct virtqueue *vq; + +list_for_each_entry (vq, &vm_dev->vdev.vqs, list) + ret |=vring_interrupt (irq, vq); }return ret;
@@ -315,14 +299,8 @@ static irqreturn_t vm_interrupt(int irq, void *opaque)static void vm_del_vq (struct virtqueue *vq) {struct virtio_mmio_device *vm_dev =to_virtio_mmio_device (vq->vdev); -struct virtio_mmio_vq_info *info = vq->priv; -unsigned long flags;unsigned int index = vq->index; -spin_lock_irqsave (&vm_dev->lock, flags); -list_del (&info->node); -spin_unlock_irqrestore (&vm_dev->lock, flags); -/* Select and deactivate the queue */ writel (index, vm_dev->base +VIRTIO_MMIO_QUEUE_SEL );if (vm_dev->version ==1 ) {
@@ -333,8 +311,6 @@ static void vm_del_vq(struct virtqueue *vq) }vring_del_virtqueue (vq); - -kfree (info); }static void vm_del_vqs (struct virtio_device *vdev)
@@ -353,9 +329,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index, const char *name) {struct virtio_mmio_device *vm_dev =to_virtio_mmio_device (vdev); -struct virtio_mmio_vq_info *info;struct virtqueue *vq; -unsigned long flags;unsigned int num;int err;
@@ -372,13 +346,6 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index, goto error_available; } -/* Allocate and fill out our active queue description */ - info =kmalloc (sizeof (*info),GFP_KERNEL ); -if (!info) { - err = -ENOMEM ; - goto error_kmalloc; - } - num =readl (vm_dev->base +VIRTIO_MMIO_QUEUE_NUM_MAX );if (num ==0 ) { err = -ENOENT ;
@@ -420,13 +387,6 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index,writel (1 , vm_dev->base +VIRTIO_MMIO_QUEUE_READY ); } - vq->priv = info; - info->vq = vq; - -spin_lock_irqsave (&vm_dev->lock, flags); -list_add (&info->node, &vm_dev->virtqueues); -spin_unlock_irqrestore (&vm_dev->lock, flags); -return vq; error_new_virtqueue:
@@ -436,8 +396,6 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index,writel (0 , vm_dev->base +VIRTIO_MMIO_QUEUE_READY );WARN_ON (readl (vm_dev->base +VIRTIO_MMIO_QUEUE_READY )); } -kfree (info); -error_kmalloc: error_available:return ERR_PTR (err); }
@@ -516,8 +474,6 @@ static int virtio_mmio_probe(struct platform_device *pdev) vm_dev->vdev.dev.release = virtio_mmio_release_dev_empty; vm_dev->vdev.config = &virtio_mmio_config_ops; vm_dev->pdev = pdev; -INIT_LIST_HEAD (&vm_dev->virtqueues); -spin_lock_init (&vm_dev->lock); vm_dev->base =devm_ioremap (&pdev->dev, mem->start,resource_size (mem));if (vm_dev->base ==NULL )
Signature · 1 line
2.11.0