Changeset 8cc4ddb in mainline for kernel/arch/ia32/include/asm.h

Timestamp:

2011-08-28T21:16:54Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0f0f8bc

Parents:

1a5b252 (diff), 36e2b55 (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 changes.

File:

• kernel/arch/ia32/include/asm.h (modified) (9 diffs)

kernel/arch/ia32/include/asm.h

@@ -118 +118 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );      
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -138 +137 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -158 +156 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -175 +172 @@
         if (((void *)port) < IO_SPACE_BOUNDARY) {
                 uint8_t val;
+                
                 asm volatile (
                         "inb %w[port], %b[val]\n"
@@ -180 +178 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint8_t) *port;
-        }
 }
 
@@ -198 +196 @@
         if (((void *)port) < IO_SPACE_BOUNDARY) {
                 uint16_t val;
+                
                 asm volatile (
                         "inw %w[port], %w[val]\n"
@@ -203 +202 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint16_t) *port;
-        }
 }
 
@@ -221 +220 @@
         if (((void *)port) < IO_SPACE_BOUNDARY) {
                 uint32_t val;
+                
                 asm volatile (
                         "inl %w[port], %[val]\n"
@@ -226 +226 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint32_t) *port;
-        }
 }