Changes in uspace/drv/bus/pci/pciintel/pci.c [f278930:ef9460b] in mainline

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (6 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -203 +203 @@
 
 static int pci_add_device(ddf_dev_t *);
-static int pci_fun_online(ddf_fun_t *);
-static int pci_fun_offline(ddf_fun_t *);
 
 /** PCI bus driver standard operations */
 static driver_ops_t pci_ops = {
-        .add_device = &pci_add_device,
-        .fun_online = &pci_fun_online,
-        .fun_offline = &pci_fun_offline,
+        .add_device = &pci_add_device
 };
 
@@ -218 +214 @@
         .driver_ops = &pci_ops
 };
+
+static pci_bus_t *pci_bus_new(void)
+{
+        pci_bus_t *bus;
+        
+        bus = (pci_bus_t *) calloc(1, sizeof(pci_bus_t));
+        if (bus == NULL)
+                return NULL;
+        
+        fibril_mutex_initialize(&bus->conf_mutex);
+        return bus;
+}
+
+static void pci_bus_delete(pci_bus_t *bus)
+{
+        assert(bus != NULL);
+        free(bus);
+}
 
 static void pci_conf_read(pci_fun_t *fun, int reg, uint8_t *buf, size_t len)
@@ -570 +584 @@
         dnode->parent_sess = NULL;
         
-        bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t));
+        bus = pci_bus_new();
         if (bus == NULL) {
                 ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
@@ -576 +590 @@
                 goto fail;
         }
-        fibril_mutex_initialize(&bus->conf_mutex);
-
         bus->dnode = dnode;
         dnode->driver_data = bus;
@@ -643 +655 @@
         
 fail:
+        if (bus != NULL)
+                pci_bus_delete(bus);
+        
         if (dnode->parent_sess)
                 async_hangup(dnode->parent_sess);
@@ -653 +668 @@
         
         return rc;
-}
-
-static int pci_fun_online(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "pci_fun_online()");
-        return ddf_fun_online(fun);
-}
-
-static int pci_fun_offline(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "pci_fun_offline()");
-        return ddf_fun_offline(fun);
 }