diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-11-12 13:36:03 +0300 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-11-12 13:36:03 +0300 |
| commit | da34232641a91ca785a787c23c158488e459b938 (patch) | |
| tree | 8be0342fa443f92a7e0f36a5c11cf094af2747d4 /arch/mips/include | |
| parent | bf463f2f7510771db180908507005379850dade0 (diff) | |
| parent | 3bfb7224566593219dbd67474dacb23ef7c080e3 (diff) | |
| download | linux-da34232641a91ca785a787c23c158488e459b938.tar.xz | |
Merge branch '4.3-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | arch/mips/include/asm/atomic.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/cdmm.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index 4c42fd9af777..b34781752244 100644 --- a/arch/mips/include/asm/atomic.h +++ b/arch/mips/include/asm/atomic.h @@ -507,7 +507,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) * @u: ...unless v is equal to u. * * Atomically adds @a to @v, so long as it was not @u. - * Returns the old value of @v. + * Returns true iff @v was not @u. */ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) { diff --git a/arch/mips/include/asm/cdmm.h b/arch/mips/include/asm/cdmm.h index bece2064cc8c..c06dbf8ba937 100644 --- a/arch/mips/include/asm/cdmm.h +++ b/arch/mips/include/asm/cdmm.h @@ -84,6 +84,17 @@ void mips_cdmm_driver_unregister(struct mips_cdmm_driver *); module_driver(__mips_cdmm_driver, mips_cdmm_driver_register, \ mips_cdmm_driver_unregister) +/* + * builtin_mips_cdmm_driver() - Helper macro for drivers that don't do anything + * special in init and have no exit. This eliminates some boilerplate. Each + * driver may only use this macro once, and calling it replaces device_initcall + * (or in some cases, the legacy __initcall). This is meant to be a direct + * parallel of module_mips_cdmm_driver() above but without the __exit stuff that + * is not used for builtin cases. + */ +#define builtin_mips_cdmm_driver(__mips_cdmm_driver) \ + builtin_driver(__mips_cdmm_driver, mips_cdmm_driver_register) + /* drivers/tty/mips_ejtag_fdc.c */ #ifdef CONFIG_MIPS_EJTAG_FDC_EARLYCON |