From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932224AbcFCM1Y (ORCPT ); Fri, 3 Jun 2016 08:27:24 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:35920 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751755AbcFCM1W (ORCPT ); Fri, 3 Jun 2016 08:27:22 -0400 Date: Fri, 3 Jun 2016 07:27:20 -0500 From: Rob Herring To: Stephen Rothwell Cc: Frank Rowand , Grant Likely , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Liu Subject: Re: [PATCH] of: silence warnings due to max() usage Message-ID: <20160603122720.GC8472@rob-hp-laptop> References: <20160531093856.75c0b04d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160531093856.75c0b04d@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 31, 2016 at 09:38:56AM +1000, Stephen Rothwell wrote: > pageblock_order can be (at least) an unsigned int or an unsigned long > depending on the kernel config and architecture, so use max_t(unsigned > long ...) when comparing it. > > fixes these warnings: > > In file included from include/linux/list.h:8:0, > from include/linux/kobject.h:20, > from include/linux/of.h:21, > from drivers/of/of_reserved_mem.c:17: > drivers/of/of_reserved_mem.c: In function ‘__reserved_mem_alloc_size’: > include/linux/kernel.h:748:17: warning: comparison of distinct pointer types lacks a cast > (void) (&_max1 == &_max2); \ > ^ > include/linux/kernel.h:747:9: note: in definition of macro ‘max’ > typeof(y) _max2 = (y); \ > ^ > drivers/of/of_reserved_mem.c:131:48: note: in expansion of macro ‘max’ > align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_ord > ^ > include/linux/kernel.h:748:17: warning: comparison of distinct pointer types lacks a cast > (void) (&_max1 == &_max2); \ > ^ > include/linux/kernel.h:747:21: note: in definition of macro ‘max’ > typeof(y) _max2 = (y); \ > ^ > drivers/of/of_reserved_mem.c:131:48: note: in expansion of macro ‘max’ > align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_ord > ^ > > Fixes: 1cc8e3458b51 ("drivers: of: of_reserved_mem: fixup the alignment with CMA setup") > Signed-off-by: Stephen Rothwell > --- > drivers/of/of_reserved_mem.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > Hi guys, this has been irking me for some time now ... I will add this > to my fixes tree in linux-next today. Please apply and send to Linus. Applied, thanks. Rob