Changes in uspace/drv/nic/virtio-net/virtio-net.c [e55d2c1:60744cb] in mainline

File:

• uspace/drv/nic/virtio-net/virtio-net.c (modified) (5 diffs)

uspace/drv/nic/virtio-net/virtio-net.c

@@ -43 +43 @@
 
 #include <virtio-pci.h>
-#include <pcapdump_iface.h>
 
 #define NAME    "virtio-net"
@@ -71 +70 @@
 };
 
-static void virtio_net_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        nic_t *nic = ddf_dev_data_get(dev);
+/** VirtIO net IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (nic_t *)
+ */
+static void virtio_net_irq_handler(ipc_call_t *icall, void *arg)
+{
+        nic_t *nic = (nic_t *)arg;
         virtio_net_t *virtio_net = nic_get_specific(nic);
         virtio_dev_t *vdev = &virtio_net->virtio_dev;
@@ -165 +169 @@
 
         return register_interrupt_handler(dev, virtio_net->irq,
-            virtio_net_irq_handler, &irq_code, &virtio_net->irq_handle);
+            virtio_net_irq_handler, (void *)nic, &irq_code,
+            &virtio_net->irq_handle);
 }
 
@@ -423 +428 @@
         }
 
-        rc = nic_fun_add_to_cats(fun);
+        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to categories");
-                ddf_fun_unbind(fun);
-                return rc;
+                ddf_msg(LVL_ERROR, "Failed adding function to category");
+                goto unbind;
         }
 
@@ -435 +439 @@
         return EOK;
 
-        // unbind:
-        // ddf_fun_unbind(fun);
+unbind:
+        ddf_fun_unbind(fun);
 destroy:
         ddf_fun_destroy(fun);