x86/intel-mid cleanups for v3.14
Subsystems (2)
Hi Linus,
Miscellaneous cleanups to the intel-mid code merged earlier in this merge window.
The following changes since commit 4500cf60dbe4b7f514d11b24c3e1edfda2a6d69d:
Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2014-01-20 12:06:50 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-intel-mid-for-linus
for you to fetch changes up to 790ed7421a973d9773dda8b4e5300c3f7f6fbcf7:
x86, intel-mid: Cleanup some platform code's header files (2014-01-28 15:13:40 -0800)
----------------------------------------------------------------
David Cohen (2):
x86, intel-mid: Add missing 'void' to functions without arguments x86, intel-mid: Cleanup some platform code's header files
Paul Gortmaker (2):
x86: Don't introduce more __cpuinit users in intel_mid_weak_decls.h
x86: Don't add new __cpuinit users to Merrifield platform code
arch/x86/platform/intel-mid/device_libs/platform_ipc.h | 5 +++-- arch/x86/platform/intel-mid/device_libs/platform_msic.h | 4 ++-- arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 6 +++--- arch/x86/platform/intel-mid/mfld.c | 6 +++--- arch/x86/platform/intel-mid/mrfl.c | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-)
arch/x86/platform/intel-mid/device_libs/platform_ipc.h +3 -2
@@ -12,6 +12,7 @@#ifndef _PLATFORM_IPC_H_#define _PLATFORM_IPC_H_ -extern void __init ipc_device_handler (struct sfi_device_table_entry *pentry, -struct devs_id *dev) __attribute__((weak)); +void __init +ipc_device_handler (struct sfi_device_table_entry *pentry,struct devs_id *dev); +#endif
arch/x86/platform/intel-mid/device_libs/platform_msic.h +2 -2
@@ -14,6 +14,6 @@extern struct intel_msic_platform_data msic_pdata; -extern void *msic_generic_platform_data (void *info, -enum intel_msic_block block) __attribute__((weak)); +void *msic_generic_platform_data (void *info,enum intel_msic_block block); +#endif
arch/x86/platform/intel-mid/intel_mid_weak_decls.h +3 -3
@@ -14,6 +14,6 @@/* For every CPU addition a new get_<cpuname>_ops interface needs * to be added. */ -extern void *__cpuinit get_penwell_ops (void ) __attribute__((weak)); -extern void *__cpuinit get_cloverview_ops (void ) __attribute__((weak)); -extern void *__init get_tangier_ops (void ) __attribute__((weak)); +extern void *get_penwell_ops (void ) __attribute__((weak)); +extern void *get_cloverview_ops (void ) __attribute__((weak)); +extern void *get_tangier_ops (void ) __attribute__((weak));
arch/x86/platform/intel-mid/mfld.c +3 -3
@@ -58,18 +58,18 @@ static unsigned long __init mfld_calibrate_tsc(void)return 0 ; } -static void __init penwell_arch_setup () +static void __init penwell_arch_setup (void ) { x86_platform.calibrate_tsc = mfld_calibrate_tsc; pm_power_off = mfld_power_off; } -void *__cpuinit get_penwell_ops () +void *get_penwell_ops (void ) {return &penwell_ops; } -void *__cpuinit get_cloverview_ops () +void *get_cloverview_ops (void ) {return &penwell_ops; }
arch/x86/platform/intel-mid/mrfl.c +1 -1
@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = { .arch_setup = tangier_arch_setup, }; -void *__cpuinit get_tangier_ops () +void *get_tangier_ops (void ) {return &tangier_ops; }