From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031764AbdDZWek (ORCPT ); Wed, 26 Apr 2017 18:34:40 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:13363 "EHLO smtp2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031714AbdDZWeh (ORCPT ); Wed, 26 Apr 2017 18:34:37 -0400 Subject: [PATCH v2] arm: bitops: Align prototypes to generic API To: Russell King - ARM Linux Cc: Vinod Koul , Stephen Rothwell , linux-next , LKML , Linux ARM , arm-soc , Emilio Lopez , dmaengine@vger.kernel.org, Dan Williams , Maxime Ripard , Chen-Yu Tsai References: <20170421084033.5c987e13@canb.auug.org.au> <9858a4ed-bdd9-bd6c-d8a4-e9e6bd539904@free.fr> <20170421181230.05dcf937@canb.auug.org.au> <20170421234315.GO17774@n2100.armlinux.org.uk> <20170424042033.GC6263@localhost> From: Mason Message-ID: Date: Thu, 27 Apr 2017 00:34:01 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Firefox/52.0 SeaMonkey/2.49 MIME-Version: 1.0 In-Reply-To: <20170424042033.GC6263@localhost> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Gonzalez include/asm-generic/bitops/find.h declares: extern unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size); while arch/arm/include/asm/bitops.h declares: #define find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz) extern int _find_first_zero_bit_le(const void * p, unsigned size); Align the arm prototypes to the generic API, to have gcc report inadequate arguments, such as pointer to u32. Signed-off-by: Marc Gonzalez --- The patch fixing drivers/dma/sun4i-dma.c ("dmaengine: sun4i: fix invalid argument") has landed on linux-next (thanks Vinod) as 57192245bc074710ea1a128d39ecc429455ac815 --- arch/arm/include/asm/bitops.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h index e943e6cee254..f308c8c40cb9 100644 --- a/arch/arm/include/asm/bitops.h +++ b/arch/arm/include/asm/bitops.h @@ -159,16 +159,16 @@ extern int _test_and_change_bit(int nr, volatile unsigned long * p); /* * Little endian assembly bitops. nr = 0 -> byte 0 bit 0. */ -extern int _find_first_zero_bit_le(const void * p, unsigned size); -extern int _find_next_zero_bit_le(const void * p, int size, int offset); +extern int _find_first_zero_bit_le(const unsigned long *p, unsigned size); +extern int _find_next_zero_bit_le(const unsigned long *p, int size, int offset); extern int _find_first_bit_le(const unsigned long *p, unsigned size); extern int _find_next_bit_le(const unsigned long *p, int size, int offset); /* * Big endian assembly bitops. nr = 0 -> byte 3 bit 0. */ -extern int _find_first_zero_bit_be(const void * p, unsigned size); -extern int _find_next_zero_bit_be(const void * p, int size, int offset); +extern int _find_first_zero_bit_be(const unsigned long *p, unsigned size); +extern int _find_next_zero_bit_be(const unsigned long *p, int size, int offset); extern int _find_first_bit_be(const unsigned long *p, unsigned size); extern int _find_next_bit_be(const unsigned long *p, int size, int offset); -- 2.11.0