From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Darren Hart <dvhart@infradead.org>,
Lee Jones <lee.jones@linaro.org>,
x86@kernel.org
Cc: Zha Qipeng <qipeng.zha@intel.com>,
Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>,
"David E . Box" <david.e.box@linux.intel.com>,
Guenter Roeck <linux@roeck-us.net>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 18/37] platform/x86: intel_pmc_ipc: Make intel_pmc_gcr_update() static
Date: Mon, 23 Dec 2019 17:16:57 +0300 [thread overview]
Message-ID: <20191223141716.13727-19-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20191223141716.13727-1-mika.westerberg@linux.intel.com>
This function is not called outside of intel_pmc_ipc.c so we can make it
static instead.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
arch/x86/include/asm/intel_pmc_ipc.h | 6 ------
drivers/platform/x86/intel_pmc_ipc.c | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/intel_pmc_ipc.h b/arch/x86/include/asm/intel_pmc_ipc.h
index 9e7adcdbe031..3b2e8b461520 100644
--- a/arch/x86/include/asm/intel_pmc_ipc.h
+++ b/arch/x86/include/asm/intel_pmc_ipc.h
@@ -40,7 +40,6 @@ int intel_pmc_s0ix_counter_read(u64 *data);
int intel_pmc_gcr_read(u32 offset, u32 *data);
int intel_pmc_gcr_read64(u32 offset, u64 *data);
int intel_pmc_gcr_write(u32 offset, u32 data);
-int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val);
#else
@@ -81,11 +80,6 @@ static inline int intel_pmc_gcr_write(u32 offset, u32 data)
return -EINVAL;
}
-static inline int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val)
-{
- return -EINVAL;
-}
-
#endif /*CONFIG_INTEL_PMC_IPC*/
#endif
diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
index 5c1da2bb1435..9229c7a16536 100644
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
@@ -309,7 +309,7 @@ EXPORT_SYMBOL_GPL(intel_pmc_gcr_write);
*
* Return: negative value on error or 0 on success.
*/
-int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val)
+static int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val)
{
u32 new_val;
int ret = 0;
@@ -339,7 +339,6 @@ int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val)
spin_unlock(&ipcdev.gcr_lock);
return ret;
}
-EXPORT_SYMBOL_GPL(intel_pmc_gcr_update);
static int update_no_reboot_bit(void *priv, bool set)
{
--
2.24.0
next prev parent reply other threads:[~2019-12-23 14:16 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 14:16 [PATCH 00/37] platform/x86: Rework intel_scu_ipc and intel_pmc_ipc drivers Mika Westerberg
2019-12-23 14:16 ` [PATCH 01/37] platform/x86: intel_mid_powerbtn: Take a copy of ddata Mika Westerberg
2019-12-23 14:16 ` [PATCH 02/37] platform/x86: intel_scu_ipcutil: Remove default y from Kconfig Mika Westerberg
2019-12-23 14:16 ` [PATCH 03/37] platform/x86: intel_scu_ipc: Add constants for register offsets Mika Westerberg
2019-12-23 14:16 ` [PATCH 04/37] platform/x86: intel_scu_ipc: Remove Lincroft support Mika Westerberg
2019-12-23 14:16 ` [PATCH 05/37] platform/x86: intel_scu_ipc: Drop intel_scu_ipc_i2c_cntrl() Mika Westerberg
2019-12-23 14:16 ` [PATCH 06/37] platform/x86: intel_scu_ipc: Fix interrupt support Mika Westerberg
2019-12-23 14:16 ` [PATCH 07/37] platform/x86: intel_scu_ipc: Sleeping is fine when polling Mika Westerberg
2019-12-23 14:16 ` [PATCH 08/37] platform/x86: intel_scu_ipc: Drop unused prototype intel_scu_ipc_fw_update() Mika Westerberg
2019-12-23 14:16 ` [PATCH 09/37] platform/x86: intel_scu_ipc: Drop unused macros Mika Westerberg
2019-12-23 14:16 ` [PATCH 10/37] platform/x86: intel_scu_ipc: Drop intel_scu_ipc_io[read|write][8|16]() Mika Westerberg
2019-12-23 14:16 ` [PATCH 11/37] platform/x86: intel_scu_ipc: Drop intel_scu_ipc_raw_command() Mika Westerberg
2019-12-23 14:16 ` [PATCH 12/37] platform/x86: intel_scu_ipc: Split out SCU IPC functionality from the SCU driver Mika Westerberg
2020-01-02 8:58 ` Lee Jones
2019-12-23 14:16 ` [PATCH 13/37] platform/x86: intel_scu_ipc: Reformat kernel-doc comments of exported functions Mika Westerberg
2019-12-23 14:16 ` [PATCH 14/37] platform/x86: intel_scu_ipc: Introduce new SCU IPC API Mika Westerberg
2019-12-23 14:16 ` [PATCH 15/37] platform/x86: intel_mid_powerbtn: Convert to use " Mika Westerberg
2019-12-23 14:16 ` [PATCH 16/37] watchdog: intel-mid_wdt: " Mika Westerberg
2019-12-23 15:46 ` Guenter Roeck
2019-12-27 9:59 ` Mika Westerberg
2019-12-23 14:16 ` [PATCH 17/37] platform/x86: intel_scu_ipcutil: " Mika Westerberg
2019-12-23 14:16 ` Mika Westerberg [this message]
2019-12-23 14:16 ` [PATCH 19/37] platform/x86: intel_pmc_ipc: Make intel_pmc_ipc_simple_command() static Mika Westerberg
2019-12-23 14:16 ` [PATCH 20/37] platform/x86: intel_pmc_ipc: Make intel_pmc_ipc_raw_cmd() static Mika Westerberg
2019-12-23 14:17 ` [PATCH 21/37] platform/x86: intel_pmc_ipc: Drop intel_pmc_gcr_read() and intel_pmc_gcr_write() Mika Westerberg
2019-12-23 14:17 ` [PATCH 22/37] platform/x86: intel_pmc_ipc: Drop ipc_data_readb() Mika Westerberg
2019-12-23 14:17 ` [PATCH 23/37] platform/x86: intel_pmc_ipc: Get rid of unnecessary includes Mika Westerberg
2019-12-23 14:17 ` [PATCH 24/37] platform/x86: intel_scu_ipc: Add function to remove SCU IPC Mika Westerberg
2019-12-23 14:17 ` [PATCH 25/37] platform/x86: intel_pmc_ipc: Start using " Mika Westerberg
2019-12-23 14:17 ` [PATCH 26/37] mfd: intel_soc_pmic: Add SCU IPC member to struct intel_soc_pmic Mika Westerberg
2020-01-02 9:01 ` Lee Jones
2020-01-02 9:45 ` Mika Westerberg
2019-12-23 14:17 ` [PATCH 27/37] mfd: intel_soc_pmic_bxtwc: Convert to use new SCU IPC API Mika Westerberg
2020-01-02 9:16 ` Lee Jones
2019-12-23 14:17 ` [PATCH 28/37] mfd: intel_soc_pmic_mrfld: " Mika Westerberg
2020-01-02 9:17 ` Lee Jones
2019-12-23 14:17 ` [PATCH 29/37] platform/x86: intel_telemetry: " Mika Westerberg
2019-12-23 14:17 ` [PATCH 30/37] platform/x86: intel_pmc_ipc: Drop intel_pmc_ipc_command() Mika Westerberg
2019-12-23 14:17 ` [PATCH 31/37] x86/platform/intel-mid: Add empty stubs for intel_scu_devices_[create|destroy]() Mika Westerberg
2019-12-23 14:17 ` [PATCH 32/37] platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c Mika Westerberg
2019-12-23 14:17 ` [PATCH 33/37] platform/x86: intel_pmc_ipc: Move under MFD Mika Westerberg
2020-01-02 9:41 ` Lee Jones
2020-01-02 9:50 ` Mika Westerberg
2019-12-23 14:17 ` [PATCH 34/37] mfd: intel_pmc_bxt: Convert to use MFD APIs Mika Westerberg
2019-12-23 14:17 ` [PATCH 35/37] mfd: intel_pmc_bxt: Use octal permissions in sysfs attributes Mika Westerberg
2019-12-23 14:17 ` [PATCH 36/37] mfd: intel_pmc_bxt: Switch to use driver->dev_groups Mika Westerberg
2019-12-23 14:17 ` [PATCH 37/37] MAINTAINERS: Update entry for Intel Broxton PMC driver Mika Westerberg
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=20191223141716.13727-19-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=david.e.box@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=platform-driver-x86@vger.kernel.org \
--cc=qipeng.zha@intel.com \
--cc=rajneesh.bhardwaj@linux.intel.com \
--cc=wim@linux-watchdog.org \
--cc=x86@kernel.org \
/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