Merge branches 'kbuild', 'packaging' and 'misc' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / drivers / net / xilinx_emaclite.c

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 039d976ba313fe4ad39fd42e77cb9c435dfaa077..8018d7d045b044bbd0bb5dfa403e53d47d1bf390 100644 (file)
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -252,11 +252,11 @@ static void xemaclite_aligned_write(void *src_ptr, u32 *dest_ptr,
        u16 *from_u16_ptr, *to_u16_ptr;
 
        to_u32_ptr = dest_ptr;
-       from_u16_ptr = (u16 *) src_ptr;
+       from_u16_ptr = src_ptr;
        align_buffer = 0;
 
        for (; length > 3; length -= 4) {
-               to_u16_ptr = (u16 *) ((void *) &align_buffer);
+               to_u16_ptr = (u16 *)&align_buffer;
                *to_u16_ptr++ = *from_u16_ptr++;
                *to_u16_ptr++ = *from_u16_ptr++;