diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-01-07 07:34:57 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-01-09 17:13:36 -0500 |
commit | f1be6cdaf57ce918828b6cff6ff2b4ea87be7f62 (patch) | |
tree | 3dcf316dc04c16b9a36a910a45f6465fc9f48413 | |
parent | ecc7ea5dd1409d4e6dfba2f0ff0ee1c6ccd855bd (diff) |
x86/platform/intel-mid: Make intel_scu_device_register() static
There is no need anymore to have intel_scu_device_register() exported. Annotate
it with static keyword.
While here, rename to intel_scu_ipc_device_register() to use same pattern for
all SFI enumerated device register helpers.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: http://lkml.kernel.org/r/20170107123457.53033-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/include/asm/intel-mid.h | 1 | ||||
-rw-r--r-- | arch/x86/platform/intel-mid/sfi.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h index 91ead0cefa76..fe04491130ae 100644 --- a/arch/x86/include/asm/intel-mid.h +++ b/arch/x86/include/asm/intel-mid.h | |||
@@ -27,7 +27,6 @@ extern void intel_mid_pwr_power_off(void); | |||
27 | extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev); | 27 | extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev); |
28 | 28 | ||
29 | extern int get_gpio_by_name(const char *name); | 29 | extern int get_gpio_by_name(const char *name); |
30 | extern void intel_scu_device_register(struct platform_device *pdev); | ||
31 | extern int __init sfi_parse_mrtc(struct sfi_table_header *table); | 30 | extern int __init sfi_parse_mrtc(struct sfi_table_header *table); |
32 | extern int __init sfi_parse_mtmr(struct sfi_table_header *table); | 31 | extern int __init sfi_parse_mtmr(struct sfi_table_header *table); |
33 | extern int sfi_mrtc_num; | 32 | extern int sfi_mrtc_num; |
diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c index e8f68f652087..ce1303830231 100644 --- a/arch/x86/platform/intel-mid/sfi.c +++ b/arch/x86/platform/intel-mid/sfi.c | |||
@@ -226,7 +226,7 @@ int get_gpio_by_name(const char *name) | |||
226 | return -EINVAL; | 226 | return -EINVAL; |
227 | } | 227 | } |
228 | 228 | ||
229 | void __init intel_scu_device_register(struct platform_device *pdev) | 229 | static void __init intel_scu_ipc_device_register(struct platform_device *pdev) |
230 | { | 230 | { |
231 | if (ipc_next_dev == MAX_IPCDEVS) | 231 | if (ipc_next_dev == MAX_IPCDEVS) |
232 | pr_err("too many SCU IPC devices"); | 232 | pr_err("too many SCU IPC devices"); |
@@ -361,7 +361,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry, | |||
361 | 361 | ||
362 | pdev->dev.platform_data = pdata; | 362 | pdev->dev.platform_data = pdata; |
363 | if (dev->delay) | 363 | if (dev->delay) |
364 | intel_scu_device_register(pdev); | 364 | intel_scu_ipc_device_register(pdev); |
365 | else | 365 | else |
366 | platform_device_add(pdev); | 366 | platform_device_add(pdev); |
367 | } | 367 | } |