2 files changed, 4 insertions, 8 deletions

diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index b01d38125a8f..143cc432fdb2 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -55,7 +55,7 @@ static inline void sOutW(unsigned short port, unsigned short value)
 
 static inline void out32(unsigned short port, Byte_t *p)
 {
-        u32 value = le32_to_cpu(get_unaligned((__le32 *)p));
+        u32 value = get_unaligned_le32(p);
 #ifdef ROCKET_DEBUG_IO
         printk(KERN_DEBUG "out32(%x, %lx)...\n", port, value);
 #endif
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index 1b75b0b7d542..31a7765eaf73 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -63,16 +63,13 @@ static int
 scdrv_parse_event(char *event, int *src, int *code, int *esp_code, char *desc)
 {
         char *desc_end;
-        __be32 from_buf;
 
         /* record event source address */
-        from_buf = get_unaligned((__be32 *)event);
-        *src = be32_to_cpup(&from_buf);
+        *src = get_unaligned_be32(event);
         event += 4;                     /* move on to event code */
 
         /* record the system controller's event code */
-        from_buf = get_unaligned((__be32 *)event);
-        *code = be32_to_cpup(&from_buf);
+        *code = get_unaligned_be32(event);
         event += 4;                     /* move on to event arguments */
 
         /* how many arguments are in the packet? */
@@ -86,8 +83,7 @@ scdrv_parse_event(char *event, int *src, int *code, int *esp_code, char *desc)
                 /* not an integer argument, so give up */
                 return -1;
         }
-        from_buf = get_unaligned((__be32 *)event);
-        *esp_code = be32_to_cpup(&from_buf);
+        *esp_code = get_unaligned_be32(event);
         event += 4;
 
         /* parse out the event description */