From: tip-bot for Andy Shevchenko <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: andriy.shevchenko@linux.intel.com, hpa@zytor.com,
tglx@linutronix.de, mingo@kernel.org,
linux-kernel@vger.kernel.org
Subject: [tip:x86/platform] x86/platform/intel-mid: Make intel_scu_device_register() static
Date: Mon, 9 Jan 2017 14:18:46 -0800 [thread overview]
Message-ID: <tip-f1be6cdaf57ce918828b6cff6ff2b4ea87be7f62@git.kernel.org> (raw)
In-Reply-To: <20170107123457.53033-1-andriy.shevchenko@linux.intel.com>
Commit-ID: f1be6cdaf57ce918828b6cff6ff2b4ea87be7f62
Gitweb: http://git.kernel.org/tip/f1be6cdaf57ce918828b6cff6ff2b4ea87be7f62
Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Sat, 7 Jan 2017 14:34:57 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
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 <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>
---
arch/x86/include/asm/intel-mid.h | 1 -
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 91ead0c..fe04491 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);
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;
diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c
index e8f68f6..ce13038 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)
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);
}
prev parent reply other threads:[~2017-01-09 22:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-07 12:34 [PATCH v1 1/1] " Andy Shevchenko
2017-01-09 22:18 ` tip-bot for Andy Shevchenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-f1be6cdaf57ce918828b6cff6ff2b4ea87be7f62@git.kernel.org \
--to=tipbot@zytor.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome