Changeset 584aa38 in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2014-01-25T03:27:29Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8a81e431

Parents:

bfff7fd

Message:

ohci: Remove error checking macro

File:

• uspace/drv/bus/usb/ohci/ohci_batch.c (modified) (5 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -97 +97 @@
 {
         assert(usb_batch);
-#define CHECK_NULL_DISPOSE_RET(ptr, message...) \
-if (ptr == NULL) { \
-        usb_log_error(message); \
-        ohci_transfer_batch_dispose(ohci_batch); \
-        return NULL; \
-} else (void)0
 
         ohci_transfer_batch_t *ohci_batch =
             calloc(1, sizeof(ohci_transfer_batch_t));
-        CHECK_NULL_DISPOSE_RET(ohci_batch,
-            "Failed to allocate OHCI batch data.\n");
+        if (!ohci_batch) {
+                usb_log_error("Failed to allocate OHCI batch data.");
+                goto dispose;
+        }
         link_initialize(&ohci_batch->link);
         ohci_batch->td_count =
@@ -119 +115 @@
         /* We need an extra place for TD that was left at ED */
         ohci_batch->tds = calloc(ohci_batch->td_count + 1, sizeof(td_t*));
-        CHECK_NULL_DISPOSE_RET(ohci_batch->tds,
-            "Failed to allocate OHCI transfer descriptors.\n");
+        if (!ohci_batch->tds) {
+                usb_log_error("Failed to allocate OHCI transfer descriptors.");
+                goto dispose;
+        }
 
         /* Add TD left over by the previous transfer */
@@ -128 +126 @@
         for (unsigned i = 1; i <= ohci_batch->td_count; ++i) {
                 ohci_batch->tds[i] = malloc32(sizeof(td_t));
-                CHECK_NULL_DISPOSE_RET(ohci_batch->tds[i],
-                    "Failed to allocate TD %d.\n", i );
+                if (!ohci_batch->tds[i]) {
+                        usb_log_error("Failed to allocate TD %d.", i);
+                        goto dispose;
+                }
         }
 
@@ -141 +141 @@
                 ohci_batch->device_buffer =
                     malloc32(usb_batch->setup_size + usb_batch->buffer_size);
-                CHECK_NULL_DISPOSE_RET(ohci_batch->device_buffer,
-                    "Failed to allocate device accessible buffer.\n");
+                if (!ohci_batch->device_buffer) {
+                        usb_log_error("Failed to allocate device buffer");
+                        goto dispose;
+                }
                 /* Copy setup data */
                 memcpy(ohci_batch->device_buffer, usb_batch->setup_buffer,
@@ -159 +161 @@
 
         return ohci_batch;
-#undef CHECK_NULL_DISPOSE_RET
+dispose:
+        ohci_transfer_batch_dispose(ohci_batch);
+        return NULL;
 }