luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull intel MID cleanups from Peter Anvin:
 "Miscellaneous cleanups to the intel-mid code merged earlier in this
  merge window"

* 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, intel-mid: Cleanup some platform code's header files
  x86, intel-mid: Add missing 'void' to functions without arguments
  x86: Don't add new __cpuinit users to Merrifield platform code
  x86: Don't introduce more __cpuinit users in intel_mid_weak_decls.h
This commit is contained in:
Linus Torvalds 2014-01-29 18:23:30 -08:00
commit cac9283ca3
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/platform/intel-mid/device_libs/platform_ipc.h
View File

@ -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

4
arch/x86/platform/intel-mid/device_libs/platform_msic.h
View File

@ -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

6
arch/x86/platform/intel-mid/intel_mid_weak_decls.h
View File

@ -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));

6
arch/x86/platform/intel-mid/mfld.c
View File

@ -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;
}

2
arch/x86/platform/intel-mid/mrfl.c
View File

@ -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;
}