Changeset 95c675b in mainline for kernel/arch/sparc64/src/drivers/pci.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• kernel/arch/sparc64/src/drivers/pci.c (modified) (4 diffs)

kernel/arch/sparc64/src/drivers/pci.c

@@ -42 +42 @@
 #include <mm/slab.h>
 #include <typedefs.h>
-#include <debug.h>
+#include <assert.h>
 #include <log.h>
 #include <str.h>
@@ -175 +175 @@
          * First, verify this is a PCI node.
          */
-        ASSERT(str_cmp(ofw_tree_node_name(node), "pci") == 0);
+        assert(str_cmp(ofw_tree_node_name(node), "pci") == 0);
 
         /*
@@ -210 +210 @@
 void pci_enable_interrupt(pci_t *pci, int inr)
 {
-        ASSERT(pci->op && pci->op->enable_interrupt);
+        assert(pci->op && pci->op->enable_interrupt);
         pci->op->enable_interrupt(pci, inr);
 }
@@ -218 +218 @@
         pci_t *pci = (pci_t *)pcip;
 
-        ASSERT(pci->op && pci->op->clear_interrupt);
+        assert(pci->op && pci->op->clear_interrupt);
         pci->op->clear_interrupt(pci, inr);
 }