From: Peter Meerwald <pmeerw@pmeerw.net>
Date: Sat, 14 Jul 2012 16:23:00 +0000 (+0100)
Subject: iio staging: fix cast warning and cleanup alignment code
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=dcbc3c414e62faa4e1a1e17421f89eceea6bee30;p=deliverable%2Flinux.git

iio staging: fix cast warning and cleanup alignment code

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---

diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index d7f8af7678fd..18d108fd967a 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -151,8 +151,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
 
 	  /* Guaranteed to be aligned with 8 byte boundary */
 	if (indio_dev->scan_timestamp)
-		*(s64 *)(((phys_addr_t)data + len
-				+ sizeof(s64) - 1) & ~(sizeof(s64) - 1))
+		*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
 			= pf->timestamp;
 	buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);