]> git.karo-electronics.de Git - karo-tx-linux.git/commit
MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h
authorDavid Daney <david.daney@cavium.com>
Fri, 28 Sep 2012 18:34:10 +0000 (11:34 -0700)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 14 Oct 2012 22:51:40 +0000 (00:51 +0200)
commit6fd0bca25c09d74ee26e4c2893f8d4c06ecabe7e
tree0143649156db1090faf516c83297a5b4faa8ceda
parentddffeb8c4d0331609ef2581d84de4d763607bd37
MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h

At some recent point arch/mips/include/asm/delay.h has started being
included into csrc-octeon.c where the __?delay() functions are defined.
This causes a compile failure due to conflicting declarations and
definitions of the functions.

It turns out that the generic definitions in arch/mips/lib/delay.c also
conflict.

Proposed fix: Declare the functions to take unsigned long parameters
just like asm-generic (and x86) does.  Update __delay to agree
(__ndelay and __udelay need no change).

Bonus: Get rid of 'inline' from __delay() definition, as it is globally
visible, and the compiler should be making this decision itself (it does
in fact inline the function without being told to).

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/4354/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/delay.h
arch/mips/lib/delay.c