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>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Zha Qipeng <qipeng.zha@intel.com>,
"David E . Box" <david.e.box@linux.intel.com>,
Guenter Roeck <linux@roeck-us.net>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
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 v9 16/20] x86/platform/intel-mid: Add empty stubs for intel_scu_devices_[create|destroy]()
Date: Thu, 16 Apr 2020 11:15:48 +0300 [thread overview]
Message-ID: <20200416081552.68083-17-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20200416081552.68083-1-mika.westerberg@linux.intel.com>
This allows to call the functions even when CONFIG_X86_INTEL_MID is not
enabled.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/include/asm/intel-mid.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h
index 8e5af119dc2d..de58391bdee0 100644
--- a/arch/x86/include/asm/intel-mid.h
+++ b/arch/x86/include/asm/intel-mid.h
@@ -88,11 +88,17 @@ static inline bool intel_mid_has_msic(void)
return (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_PENWELL);
}
+extern void intel_scu_devices_create(void);
+extern void intel_scu_devices_destroy(void);
+
#else /* !CONFIG_X86_INTEL_MID */
#define intel_mid_identify_cpu() 0
#define intel_mid_has_msic() 0
+static inline void intel_scu_devices_create(void) { }
+static inline void intel_scu_devices_destroy(void) { }
+
#endif /* !CONFIG_X86_INTEL_MID */
enum intel_mid_timer_options {
@@ -115,9 +121,6 @@ extern enum intel_mid_timer_options intel_mid_timer_options;
#define SFI_MTMR_MAX_NUM 8
#define SFI_MRTC_MAX 8
-extern void intel_scu_devices_create(void);
-extern void intel_scu_devices_destroy(void);
-
/* VRTC timer */
#define MRST_VRTC_MAP_SZ 1024
/* #define MRST_VRTC_PGOFFSET 0xc00 */
--
2.25.1
next prev parent reply other threads:[~2020-04-16 8:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 8:15 [PATCH v9 00/20] platform/x86: Rework intel_scu_ipc and intel_pmc_ipc drivers Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 01/20] platform/x86: intel_scu_ipc: Split out SCU IPC functionality from the SCU driver Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 02/20] platform/x86: intel_scu_ipc: Log more information if SCU IPC command fails Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 03/20] platform/x86: intel_scu_ipc: Move legacy SCU IPC API to a separate header Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 04/20] platform/x86: intel_scu_ipc: Introduce new SCU IPC API Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 05/20] platform/x86: intel_mid_powerbtn: Convert to use " Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 06/20] watchdog: intel-mid_wdt: " Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 07/20] platform/x86: intel_scu_ipcutil: " Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 08/20] platform/x86: intel_scu_ipc: Add managed function to register SCU IPC Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 09/20] platform/x86: intel_pmc_ipc: Start using " Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 10/20] mfd: intel_soc_pmic: Add SCU IPC member to struct intel_soc_pmic Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 11/20] mfd: intel_soc_pmic_bxtwc: Convert to use new SCU IPC API Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 12/20] mfd: intel_soc_pmic_mrfld: " Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 13/20] platform/x86: intel_telemetry: " Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 14/20] usb: typec: mux: Convert the Intel PMC Mux driver " Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 15/20] platform/x86: intel_pmc_ipc: Drop intel_pmc_ipc_command() Mika Westerberg
2020-04-16 8:15 ` Mika Westerberg [this message]
2020-04-16 8:15 ` [PATCH v9 17/20] platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 18/20] platform/x86: intel_telemetry: Add telemetry_get_pltdata() Mika Westerberg
2020-04-16 8:15 ` [PATCH v9 19/20] platform/x86: intel_pmc_ipc: Convert to MFD Mika Westerberg
2020-04-17 10:57 ` Lee Jones
2020-04-17 10:59 ` Andy Shevchenko
2020-04-20 7:29 ` Lee Jones
2020-04-16 8:15 ` [PATCH v9 20/20] MAINTAINERS: Update entry for Intel Broxton PMC driver Mika Westerberg
2020-04-24 10:24 ` [GIT PULL] Immutable branch between MFD, X86, USB and Watchdog due for the v5.7 merge window Lee Jones
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=20200416081552.68083-17-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=david.e.box@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hpa@zytor.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mingo@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=qipeng.zha@intel.com \
--cc=tglx@linutronix.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.