[coreboot-gerrit] New patch to review for coreboot: b92e197 southbridge/intel/lynxpoint/me_9.x.c: Use IS_ENABLED macro

[Edward O'Callaghan]

Edward O'Callaghan ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6054

-gerrit

commit b92e197814f3e9e57e8ba829d858eb2c44baa213
Author: Edward O'Callaghan 
Date:   Tue Jun 17 15:12:09 2014 +1000

southbridge/intel/lynxpoint/me_9.x.c: Use IS_ENABLED macro

Silence unused function warnings, spotted by Clang.

Change-Id: I5127893e9605ca490ff450faa92af5e9eafe8940
    Signed-off-by: Edward O'Callaghan 
---
 src/southbridge/intel/lynxpoint/me_9.x.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c
index d3dfcfb..a1307d6 100644
--- a/src/southbridge/intel/lynxpoint/me_9.x.c
+++ b/src/southbridge/intel/lynxpoint/me_9.x.c
@@ -374,6 +374,7 @@ static int mei_recv_msg(void *header, int header_bytes,
    return mei_wait_for_me_ready();
 }

+#if IS_ENABLED (CONFIG_DEBUG_INTEL_ME)
 static inline int mei_sendrecv_mkhi(struct mkhi_header *mkhi,
    			    void *req_data, int req_bytes,
    			    void *rsp_data, int rsp_bytes)
@@ -411,6 +412,7 @@ static inline int mei_sendrecv_mkhi(struct mkhi_header *mkhi,

return 0;
 }
+#endif /* CONFIG_DEBUG_INTEL_ME */

static inline int mei_sendrecv_icc(struct icc_header *icc,
    			   void *req_data, int req_bytes,
@@ -478,12 +480,6 @@ void intel_me_mbp_clear(device_t dev)
 }

#if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL >= BIOS_DEBUG) && !defined(__SMM__)
-static inline void print_cap(const char *name, int state)
-{
-	printk(BIOS_DEBUG, "ME Capability: %-41s : %sabled\n",
-	       name, state ? " en" : "dis");
-}
-
 static void me_print_fw_version(mbp_fw_version_name *vers_name)
 {
    if (!vers_name) {
@@ -496,7 +492,13 @@ static void me_print_fw_version(mbp_fw_version_name *vers_name)
           vers_name->hotfix_version, vers_name->build_version);
 }

-#if CONFIG_DEBUG_INTEL_ME
+#if IS_ENABLED (CONFIG_DEBUG_INTEL_ME)
+static inline void print_cap(const char *name, int state)
+{
+	printk(BIOS_DEBUG, "ME Capability: %-41s : %sabled\n",
+	       name, state ? " en" : "dis");
+}
+
 /* Get ME Firmware Capabilities */
 static int mkhi_get_fwcaps(mbp_mefwcaps *cap)
 {
@@ -535,7 +537,7 @@ static void me_print_fwcaps(mbp_mefwcaps *cap)
    print_cap("IntelR Capability Licensing Service (CLS)", cap->intel_cls);
    print_cap("IntelR Power Sharing Technology (MPC)", cap->intel_mpc);
    print_cap("ICC Over Clocking", cap->icc_over_clocking);
-        print_cap("Protected Audio Video Path (PAVP)", cap->pavp);
+	print_cap("Protected Audio Video Path (PAVP)", cap->pavp);
    print_cap("IPV6", cap->ipv6);
    print_cap("KVM Remote Control (KVM)", cap->kvm);
    print_cap("Outbreak Containment Heuristic (OCH)", cap->och);
@@ -543,7 +545,7 @@ static void me_print_fwcaps(mbp_mefwcaps *cap)
    print_cap("TLS", cap->tls);
    print_cap("Wireless LAN (WLAN)", cap->wlan);
 }
-#endif
+#endif /* CONFIG_DEBUG_INTEL_ME */
 #endif

#if CONFIG_CHROMEOS && 0 /* DISABLED */