Changeset bab6388 in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-02-13T20:23:37Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7df0477e

Parents:

68414f4a

Message:

Small additional cleanup.

File:

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

uspace/drv/pciintel/pci.c

@@ -111 +111 @@
         pci_bus_t *bus;
         
-        bus = (pci_bus_t *) malloc(sizeof(pci_bus_t));
-        if (bus != NULL) {
-                memset(bus, 0, sizeof(pci_bus_t));
-                fibril_mutex_initialize(&bus->conf_mutex);
-        }
-
+        bus = (pci_bus_t *) calloc(1, sizeof(pci_bus_t));
+        if (bus == NULL)
+                return NULL;
+        
+        fibril_mutex_initialize(&bus->conf_mutex);
         return bus;
 }
@@ -122 +121 @@
 static void pci_bus_delete(pci_bus_t *bus)
 {
+        assert(bus != NULL);
         free(bus);
 }
@@ -228 +228 @@
                 add_match_id(&fun->fnode->match_ids, match_id);
         }
-
+        
         /* TODO add more ids (with subsys ids, using class id etc.) */
 }
@@ -266 +266 @@
  */
 int pci_read_bar(pci_fun_t *fun, int addr)
-{       
+{
         /* Value of the BAR */
         uint32_t val, mask;
@@ -369 +369 @@
         bool multi;
         uint8_t header_type;
-
+        
         /* We need this early, before registering. */
         fun->fnode = fnode;
@@ -485 +485 @@
                 async_hangup(dnode->parent_phone);
                 return rc;
-        }       
+        }
         
         printf(NAME ": conf_addr = %" PRIx64 ".\n",
@@ -531 +531 @@
 pci_fun_t *pci_fun_new(void)
 {
-        pci_fun_t *res = (pci_fun_t *) malloc(sizeof(pci_fun_t));
-        
-        if (res != NULL)
-                memset(res, 0, sizeof(pci_fun_t));
+        pci_fun_t *res;
+        
+        res = (pci_fun_t *) calloc(1, sizeof(pci_fun_t));
         return res;
 }
@@ -547 +546 @@
 void pci_fun_delete(pci_fun_t *fun)
 {
-        if (fun != NULL) {
-                hw_res_clean_resource_list(&fun->hw_resources);
-                free(fun);
-        }
+        assert(fun != NULL);
+        hw_res_clean_resource_list(&fun->hw_resources);
+        free(fun);
 }