瀏覽代碼

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>
Peter Meerwald 13 年之前
父節點
當前提交
dcbc3c414e
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      drivers/staging/iio/accel/lis3l02dq_ring.c

+ 1 - 2
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 */
 	  /* Guaranteed to be aligned with 8 byte boundary */
 	if (indio_dev->scan_timestamp)
 	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;
 			= pf->timestamp;
 	buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);
 	buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);