Skip to contentSkip to conversation

x86/platform/intel-mid: Make intel_scu_device_register() static

PATCH New Andy Shevchenko 2 participants 2 messages Jan 7, 2017 – Jan 9, 2017

Subsystems (2)
x86 Intel MID (Mobile Internet Device) platform
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/x86/include/asm/intel-mid.h  | 1 -
 arch/x86/platform/intel-mid/sfi.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/x86/include/asm/intel-mid.h +0 -1
index 91ead0cefa76..fe04491130ae 100644
@@ -27,7 +27,6 @@ extern void intel_mid_pwr_power_off(void);
 extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev);
 
 extern int get_gpio_by_name(const char *name);
-extern void intel_scu_device_register(struct platform_device *pdev);
 extern int __init sfi_parse_mrtc(struct sfi_table_header *table);
 extern int __init sfi_parse_mtmr(struct sfi_table_header *table);
 extern int sfi_mrtc_num;
arch/x86/platform/intel-mid/sfi.c +2 -2
index e8f68f652087..ce1303830231 100644
@@ -226,7 +226,7 @@ int get_gpio_by_name(const char *name)
 	return -EINVAL;
 }
 
-void __init intel_scu_device_register(struct platform_device *pdev)
+static void __init intel_scu_ipc_device_register(struct platform_device *pdev)
 {
 	if (ipc_next_dev == MAX_IPCDEVS)
 		pr_err("too many SCU IPC devices");

@@ -361,7 +361,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,
 
 	pdev->dev.platform_data = pdata;
 	if (dev->delay)
-		intel_scu_device_register(pdev);
+		intel_scu_ipc_device_register(pdev);
 	else
 		platform_device_add(pdev);
 }
Signature · 1 line
2.11.0
merge bot
#1 lore raw
x86/platform/intel-mid: Make intel_scu_device_register() static
Commit-ID:  f1be6cdaf57ce918828b6cff6ff2b4ea87be7f62
Gitweb:     http://git.kernel.org/tip/f1be6cdaf57ce918828b6cff6ff2b4ea87be7f62
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Sat, 7 Jan 2017 14:34:57 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 9 Jan 2017 23:13:36 +0100

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 <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Thomas Gleixner <[email protected]>
---
 arch/x86/include/asm/intel-mid.h  | 1 -
 arch/x86/platform/intel-mid/sfi.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/x86/include/asm/intel-mid.h +0 -1
index 91ead0c..fe04491 100644
@@ -27,7 +27,6 @@ extern void intel_mid_pwr_power_off(void);
 extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev);
 
 extern int get_gpio_by_name(const char *name);
-extern void intel_scu_device_register(struct platform_device *pdev);
 extern int __init sfi_parse_mrtc(struct sfi_table_header *table);
 extern int __init sfi_parse_mtmr(struct sfi_table_header *table);
 extern int sfi_mrtc_num;
arch/x86/platform/intel-mid/sfi.c +2 -2
index e8f68f6..ce13038 100644
@@ -226,7 +226,7 @@ int get_gpio_by_name(const char *name)
 	return -EINVAL;
 }
 
-void __init intel_scu_device_register(struct platform_device *pdev)
+static void __init intel_scu_ipc_device_register(struct platform_device *pdev)
 {
 	if (ipc_next_dev == MAX_IPCDEVS)
 		pr_err("too many SCU IPC devices");

@@ -361,7 +361,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,
 
 	pdev->dev.platform_data = pdata;
 	if (dev->delay)
-		intel_scu_device_register(pdev);
+		intel_scu_ipc_device_register(pdev);
 	else
 		platform_device_add(pdev);
 }