From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754598AbbKWNWk (ORCPT <rfc822;w@1wt.eu>);
	Mon, 23 Nov 2015 08:22:40 -0500
Received: from foss.arm.com ([217.140.101.70]:55619 "EHLO foss.arm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752921AbbKWNWi (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 23 Nov 2015 08:22:38 -0500
Date: Mon, 23 Nov 2015 13:22:35 +0000
From: Will Deacon <will.deacon@arm.com>
To: Geliang Tang <geliangtang@163.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Arnd Bergmann <arnd@arndb.de>,
        Christian Borntraeger <borntraeger@de.ibm.com>,
        Robin Murphy <robin.murphy@arm.com>,
        Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] dma-mapping: use offset_in_page macro
Message-ID: <20151123132234.GD2755@arm.com>
References: <67e50e90bcd2753e83be3edcbb8385c25343b30a.1448115135.git.geliangtang@163.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <67e50e90bcd2753e83be3edcbb8385c25343b30a.1448115135.git.geliangtang@163.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sat, Nov 21, 2015 at 10:14:44PM +0800, Geliang Tang wrote:
> Use offset_in_page macro instead of (addr & ~PAGE_MASK).
> 
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
>  include/linux/dma-mapping.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

I don't know which tree you're aiming at, but:

  Acked-by: Will Deacon <will.deacon@arm.com>

Will

> diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
> index 3293f27..c0b27ff 100644
> --- a/include/linux/dma-mapping.h
> +++ b/include/linux/dma-mapping.h
> @@ -131,10 +131,10 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
>  	kmemcheck_mark_initialized(ptr, size);
>  	BUG_ON(!valid_dma_direction(dir));
>  	addr = ops->map_page(dev, virt_to_page(ptr),
> -			     (unsigned long)ptr & ~PAGE_MASK, size,
> +			     offset_in_page(ptr), size,
>  			     dir, attrs);
>  	debug_dma_map_page(dev, virt_to_page(ptr),
> -			   (unsigned long)ptr & ~PAGE_MASK, size,
> +			   offset_in_page(ptr), size,
>  			   dir, addr, true);
>  	return addr;
>  }
> -- 
> 2.5.0
> 
>