Changes in uspace/drv/block/virtio-blk/virtio-blk.c [e2f332c:56210a7] in mainline

File:

• uspace/drv/block/virtio-blk/virtio-blk.c (modified) (3 diffs)

uspace/drv/block/virtio-blk/virtio-blk.c

@@ -73 +73 @@
 };
 
-static void virtio_blk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        virtio_blk_t *virtio_blk = (virtio_blk_t *) ddf_dev_data_get(dev);
+/** VirtIO block IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (virtio_blk_t *)
+ */
+static void virtio_blk_irq_handler(ipc_call_t *icall, void *arg)
+{
+        virtio_blk_t *virtio_blk = (virtio_blk_t *)arg;
         virtio_dev_t *vdev = &virtio_blk->virtio_dev;
 
@@ -145 +150 @@
 
         return register_interrupt_handler(dev, virtio_blk->irq,
-            virtio_blk_irq_handler, &irq_code, &virtio_blk->irq_handle);
+            virtio_blk_irq_handler, (void *)virtio_blk, &irq_code,
+            &virtio_blk->irq_handle);
 }
 
@@ -359 +365 @@
         }
 
-        vdev->queues = calloc(sizeof(virtq_t), num_queues);
+        vdev->queues = calloc(num_queues, sizeof(virtq_t));
         if (!vdev->queues) {
                 rc = ENOMEM;