Changeset 8565a42 in mainline for kernel/generic/src/time/timeout.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• kernel/generic/src/time/timeout.c (modified) (8 diffs)

kernel/generic/src/time/timeout.c

@@ -103 +103 @@
         irq_spinlock_lock(&CPU->timeoutlock, true);
         irq_spinlock_lock(&timeout->lock, false);
-        
+
         if (timeout->cpu)
                 panic("Unexpected: timeout->cpu != 0.");
-        
+
         timeout->cpu = CPU;
         timeout->ticks = us2ticks(time);
-        
+
         timeout->handler = handler;
         timeout->arg = arg;
-        
+
         /*
          * Insert timeout into the active timeouts list according to timeout->ticks.
@@ -123 +123 @@
                 target = list_get_instance(cur, timeout_t, link);
                 irq_spinlock_lock(&target->lock, false);
-                
+
                 if (timeout->ticks < sum + target->ticks) {
                         irq_spinlock_unlock(&target->lock, false);
                         break;
                 }
-                
+
                 sum += target->ticks;
                 irq_spinlock_unlock(&target->lock, false);
         }
-        
+
         /* Avoid using cur->prev directly */
         link_t *prev = cur->prev;
         list_insert_after(&timeout->link, prev);
-        
+
         /*
          * Adjust timeout->ticks according to ticks
@@ -142 +142 @@
          */
         timeout->ticks -= sum;
-        
+
         /*
          * Decrease ticks of timeout's immediate succesor by timeout->ticks.
@@ -151 +151 @@
                 irq_spinlock_unlock(&target->lock, false);
         }
-        
+
         irq_spinlock_unlock(&timeout->lock, false);
         irq_spinlock_unlock(&CPU->timeoutlock, true);
@@ -168 +168 @@
 {
         DEADLOCK_PROBE_INIT(p_tolock);
-        
+
 grab_locks:
         irq_spinlock_lock(&timeout->lock, true);
@@ -175 +175 @@
                 return false;
         }
-        
+
         if (!irq_spinlock_trylock(&timeout->cpu->timeoutlock)) {
                 irq_spinlock_unlock(&timeout->lock, true);
@@ -181 +181 @@
                 goto grab_locks;
         }
-        
+
         /*
          * Now we know for sure that timeout hasn't been activated yet
          * and is lurking in timeout->cpu->timeout_active_list.
          */
-        
+
         link_t *cur = timeout->link.next;
         if (cur != &timeout->cpu->timeout_active_list.head) {
@@ -194 +194 @@
                 irq_spinlock_unlock(&tmp->lock, false);
         }
-        
+
         list_remove(&timeout->link);
         irq_spinlock_unlock(&timeout->cpu->timeoutlock, false);
-        
+
         timeout_reinitialize(timeout);
         irq_spinlock_unlock(&timeout->lock, true);
-        
+
         return true;
 }