Changes in uspace/drv/block/pci-ide/main.c [2a5d4649:645d3832] in mainline

File:

• uspace/drv/block/pci-ide/main.c (modified) (6 diffs)

uspace/drv/block/pci-ide/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 static errno_t pci_ide_dev_remove(ddf_dev_t *dev);
 static errno_t pci_ide_dev_gone(ddf_dev_t *dev);
-static errno_t pci_ide_dev_quiesce(ddf_dev_t *dev);
 static errno_t pci_ide_fun_online(ddf_fun_t *fun);
 static errno_t pci_ide_fun_offline(ddf_fun_t *fun);
@@ -56 +55 @@
 
 static driver_ops_t driver_ops = {
-        .dev_add = pci_ide_dev_add,
-        .dev_remove = pci_ide_dev_remove,
-        .dev_gone = pci_ide_dev_gone,
-        .dev_quiesce = pci_ide_dev_quiesce,
-        .fun_online = pci_ide_fun_online,
-        .fun_offline = pci_ide_fun_offline
+        .dev_add = &pci_ide_dev_add,
+        .dev_remove = &pci_ide_dev_remove,
+        .dev_gone = &pci_ide_dev_gone,
+        .fun_online = &pci_ide_fun_online,
+        .fun_offline = &pci_ide_fun_offline
 };
 
@@ -135 +133 @@
         pci_ide_ctrl_t *ctrl;
         pci_ide_hwres_t res;
-        async_sess_t *parent_sess;
-        unsigned chans;
         errno_t rc;
 
@@ -158 +154 @@
                 goto error;
 
-        chans = 0;
-
         rc = pci_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
-        if (rc == EOK)
-                ++chans;
-        else if (rc != ENOENT)
+        if (rc == ENOENT)
                 goto error;
 
         rc = pci_ide_channel_init(ctrl, &ctrl->channel[1], 1, &res);
-        if (rc == EOK)
-                ++chans;
-        else if (rc != ENOENT)
-                goto error;
-
-        if (chans == 0) {
-                ddf_msg(LVL_ERROR, "No PCI IDE devices found.");
-                rc = EIO;
-                goto error;
-        }
-
-        parent_sess = ddf_dev_parent_sess_get(dev);
-        if (parent_sess == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        /* Claim legacy I/O range to prevent ISA IDE from attaching there. */
-        rc = hw_res_claim_legacy_io(parent_sess, hwc_isa_ide);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed claiming legacy I/O range.");
+        if (rc == ENOENT)
+                goto error;
+
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
                 rc = EIO;
                 goto error;
@@ -376 +352 @@
 }
 
-static errno_t pci_ide_dev_quiesce(ddf_dev_t *dev)
-{
-        pci_ide_ctrl_t *ctrl = (pci_ide_ctrl_t *)ddf_dev_data_get(dev);
-
-        ddf_msg(LVL_DEBUG, "pci_ide_dev_quiesce(%p)", dev);
-
-        pci_ide_channel_quiesce(&ctrl->channel[0]);
-        pci_ide_channel_quiesce(&ctrl->channel[1]);
-
-        return EOK;
-}
-
 static errno_t pci_ide_fun_online(ddf_fun_t *fun)
 {