Changes in uspace/drv/nic/e1k/e1k.c [870841cf:807be7e] in mainline

File:

• uspace/drv/nic/e1k/e1k.c (modified) (7 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Zdenek Bouska
  * All rights reserved.
@@ -221 +220 @@
 
 static errno_t e1000_dev_add(ddf_dev_t *);
-static errno_t e1000_dev_quiesce(ddf_dev_t *);
 
 /** Basic driver operations for E1000 driver */
 static driver_ops_t e1000_driver_ops = {
-        .dev_add = e1000_dev_add,
-        .dev_quiesce = e1000_dev_quiesce
+        .dev_add = e1000_dev_add
 };
 
@@ -1247 +1244 @@
  *
  * @param icall IPC call structure
- * @param arg   Argument (nic_t *)
- *
- */
-static void e1000_interrupt_handler(ipc_call_t *icall, void *arg)
+ * @param dev   E1000 device
+ *
+ */
+static void e1000_interrupt_handler(ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         uint32_t icr = (uint32_t) ipc_get_arg2(icall);
-        nic_t *nic = (nic_t *)arg;
+        nic_t *nic = NIC_DATA_DEV(dev);
         e1000_t *e1000 = DRIVER_DATA_NIC(nic);
 
@@ -1272 +1270 @@
  *
  */
-static errno_t e1000_register_int_handler(nic_t *nic,
+inline static errno_t e1000_register_int_handler(nic_t *nic,
     cap_irq_handle_t *handle)
 {
@@ -1285 +1283 @@
 
         errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
-            e1000_interrupt_handler, (void *)nic, &e1000_irq_code, handle);
+            e1000_interrupt_handler, &e1000_irq_code, handle);
 
         fibril_mutex_unlock(&irq_reg_mutex);
@@ -1921 +1919 @@
  *
  */
-static void e1000_delete_dev_data(ddf_dev_t *dev)
+inline static void e1000_delete_dev_data(ddf_dev_t *dev)
 {
         assert(dev);
@@ -2226 +2224 @@
 }
 
-/** Quiesce E1000 device.
- *
- * @param dev E1000 device.
- *
- */
-errno_t e1000_dev_quiesce(ddf_dev_t *dev)
-{
-        nic_t *nic = ddf_dev_data_get(dev);
-        e1000_t *e1000 = DRIVER_DATA_NIC(nic);
-        errno_t rc;
-
-        ddf_msg(LVL_DEBUG, "e1000_dev_quiesce()");
-
-        e1000_disable_interrupts(e1000);
-        rc = e1000_reset(nic);
-        if (rc != EOK)
-                ddf_msg(LVL_ERROR, "e1000_dev_quiesce failed");
-        return rc;
-}
-
 /** Read 16-bit value from EEPROM of E1000 adapter
  *