Changeset 8304889 in mainline

Timestamp:

2010-10-23T17:51:33Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d93aafed

Parents:

713a4b9

Message:

Get rid of Yoda comparisons in pci.c.

File:

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

uspace/drv/pciintel/pci.c

@@ -65 +65 @@
         pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
         
-        if (NULL == dev_data)
+        if (dev_data == NULL)
                 return NULL;
         return &dev_data->hw_resources;
@@ -109 +109 @@
         
         bus_data = (pci_bus_data_t *) malloc(sizeof(pci_bus_data_t));
-        if (NULL != bus_data) {
+        if (bus_data != NULL) {
                 memset(bus_data, 0, sizeof(pci_bus_data_t));
                 fibril_mutex_initialize(&bus_data->conf_mutex);
         }
+
         return bus_data;
 }
@@ -123 +124 @@
 static void pci_conf_read(device_t *dev, int reg, uint8_t *buf, size_t len)
 {
-        assert(NULL != dev->parent);
+        assert(dev->parent != NULL);
         
         pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
@@ -153 +154 @@
 static void pci_conf_write(device_t *dev, int reg, uint8_t *buf, size_t len)
 {
-        assert(NULL != dev->parent);
+        assert(dev->parent != NULL);
         
         pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
@@ -224 +225 @@
         
         match_id = create_match_id();
-        if (NULL != match_id) {
+        if (match_id != NULL) {
                 asprintf(&match_id_str, "pci/ven=%04x&dev=%04x",
                     dev_data->vendor_id, dev_data->device_id);
@@ -230 +231 @@
                 match_id->score = 90;
                 add_match_id(&dev->match_ids, match_id);
-        }       
+        }
+
         /* TODO add more ids (with subsys ids, using class id etc.) */
 }
@@ -242 +244 @@
         size_t count = hw_res_list->count;
         
-        assert(NULL != hw_resources);
+        assert(hw_resources != NULL);
         assert(count < PCI_MAX_HW_RES);
         
@@ -354 +356 @@
 {
         uint8_t irq = pci_conf_read_8(dev, PCI_BRIDGE_INT_LINE);
-        if (0xff != irq)
+        if (irq != 0xff)
                 pci_add_interrupt(dev, irq);
 }
@@ -415 +417 @@
                         create_pci_match_ids(dev);
                         
-                        if (EOK != child_device_register(dev, parent)) {
+                        if (child_device_register(dev, parent) != EOK) {
                                 pci_clean_resource_list(dev);
                                 clean_match_ids(&dev->match_ids);
@@ -424 +426 @@
                         
                         if (header_type == PCI_HEADER_TYPE_BRIDGE ||
-                            header_type == PCI_HEADER_TYPE_CARDBUS ) {
+                            header_type == PCI_HEADER_TYPE_CARDBUS) {
                                 child_bus = pci_conf_read_8(dev,
                                     PCI_BRIDGE_SEC_BUS_NUM);
                                 printf(NAME ": device is pci-to-pci bridge, "
                                     "secondary bus number = %d.\n", bus_num);
-                                if(child_bus > bus_num)
+                                if (child_bus > bus_num)
                                         pci_bus_scan(parent, child_bus);
                         }
@@ -453 +455 @@
         
         pci_bus_data_t *bus_data = create_pci_bus_data();
-        if (NULL == bus_data) {
+        if (bus_data == NULL) {
                 printf(NAME ": pci_add_device allocation failed.\n");
                 return ENOMEM;
@@ -517 +519 @@
         pci_dev_data_t *res = (pci_dev_data_t *) malloc(sizeof(pci_dev_data_t));
         
-        if (NULL != res)
+        if (res != NULL)
                 memset(res, 0, sizeof(pci_dev_data_t));
         return res;
@@ -531 +533 @@
 void delete_pci_dev_data(pci_dev_data_t *d)
 {
-        if (NULL != d) {
+        if (d != NULL) {
                 clean_hw_resource_list(&d->hw_resources);
                 free(d);
@@ -560 +562 @@
         pci_dev_data_t *dev_data = (pci_dev_data_t *) dev->driver_data;
         
-        if (NULL != dev_data->hw_resources.resources) {
+        if (dev_data->hw_resources.resources != NULL) {
                 free(dev_data->hw_resources.resources);
                 dev_data->hw_resources.resources = NULL;