From mboxrd@z Thu Jan 1 00:00:00 1970 From: Akinobu Mita Subject: [PATCH 2/2] cris: fix return type of ffs() Date: Wed, 7 Aug 2013 22:42:39 +0900 Message-ID: <1375882959-26853-2-git-send-email-akinobu.mita@gmail.com> References: <1375882959-26853-1-git-send-email-akinobu.mita@gmail.com> Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2UugNeVbdLqfOFowgBx41xAh+4cdjAojdyRfGPoO3V8=; b=0k6A+ZCMb7SLvBhOd6KmCjLsSFwWNFLrOrp5PlGJG2wbjlc+cTczsO6evzaXwgww7r 16Dr5aBWXtdgS1WYwwJzG7mZfSOoH0o4crc1IEKjHFdGKbnOGYxcAW9ZUeRVtJa5Oo0b 15gSHt7F0OaBAabgB8oZPOsfFYp9qKWZryX2o6UzgHHd5464SPQXEiQ7mZQTYKZbSd5K IqieBuxkP5d/RH8Z+/O1hGbV2UG61YVsLua7PhCLBIQw0iYengtLvM3Qzfyxl+rJcXns gotbDzllWqQxN3yfc9odLltPL1PajZrsudfuSnlPKZ3O+77YG3DB2tn+0rpRwNu24VIb PB/w== In-Reply-To: <1375882959-26853-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-hexagon-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org Cc: Akinobu Mita , Mikael Starvik , Jesper Nilsson , linux-cris-kernel@axis.com, Richard Kuo , linux-hexagon@vger.kernel.org, linux-arch@vger.kernel.org The return type of ffs() is 'int' on all architectures except cris and hexagon. This unifies the return type to 'int'. The problem I'm seeing is that the following line generates a warning on cris and hexagon because of the mismatch between format '%u' and return type of ffs(). printk("bits in OOB size: %u\n", ffs(ns->geom.oobsz) - 1); But removing this warning by casting to 'int' looks odd, so I suggest unifying the return type of ffs() on all architectures. Signed-off-by: Akinobu Mita Reported-by: Fengguang Wu Cc: Mikael Starvik Cc: Jesper Nilsson Cc: linux-cris-kernel@axis.com Cc: Richard Kuo Cc: linux-hexagon@vger.kernel.org Cc: linux-arch@vger.kernel.org --- arch/cris/include/arch-v10/arch/bitops.h | 2 +- arch/cris/include/arch-v32/arch/bitops.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/cris/include/arch-v10/arch/bitops.h b/arch/cris/include/arch-v10/arch/bitops.h index 03d9cfd..cc37a22 100644 --- a/arch/cris/include/arch-v10/arch/bitops.h +++ b/arch/cris/include/arch-v10/arch/bitops.h @@ -65,7 +65,7 @@ static inline unsigned long __ffs(unsigned long word) * differs in spirit from the above ffz (man ffs). */ -static inline unsigned long kernel_ffs(unsigned long w) +static inline int kernel_ffs(unsigned long w) { return w ? cris_swapwbrlz (w) + 1 : 0; } diff --git a/arch/cris/include/arch-v32/arch/bitops.h b/arch/cris/include/arch-v32/arch/bitops.h index 147689d6..a5d0963 100644 --- a/arch/cris/include/arch-v32/arch/bitops.h +++ b/arch/cris/include/arch-v32/arch/bitops.h @@ -55,7 +55,7 @@ __ffs(unsigned long w) /* * Find First Bit that is set. */ -static inline unsigned long +static inline int kernel_ffs(unsigned long w) { return w ? cris_swapwbrlz (w) + 1 : 0; -- 1.8.3.1