summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnton Staaf <robotboy@chromium.org>2015-08-31 11:13:39 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-09-08 10:38:20 -0700
commit4876ab900b469d7fc92e1cb079d86262f34b9e01 (patch)
tree3b8a9889c4ef9bec55670a301b8f98e8ce939287 /include
parent84ed699ac98f7aab6556b806092bc6f8b501453f (diff)
downloadchrome-ec-4876ab900b469d7fc92e1cb079d86262f34b9e01.tar.gz
I2C: Remove unused arbitration support
The i2c_claim and i2c_release routines are no longer in use, removing this code removes one odd usecase of the panic printing routines. Signed-off-by: Anton Staaf <robotboy@chromium.org> BRANCH=None BUG=None TEST=make buildall -j Change-Id: I76c1d90738e1e39b4b3226c31085513a20bbd769 Reviewed-on: https://chromium-review.googlesource.com/296732 Commit-Ready: Anton Staaf <robotboy@chromium.org> Tested-by: Anton Staaf <robotboy@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/config.h1
-rw-r--r--include/i2c_arbitration.h44
2 files changed, 0 insertions, 45 deletions
diff --git a/include/config.h b/include/config.h
index be35fa09c9..946e9dcf5b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -951,7 +951,6 @@
/* I2C configuration */
#undef CONFIG_I2C
-#undef CONFIG_I2C_ARBITRATION
#undef CONFIG_I2C_DEBUG
#undef CONFIG_I2C_DEBUG_PASSTHRU
#undef CONFIG_I2C_PASSTHROUGH
diff --git a/include/i2c_arbitration.h b/include/i2c_arbitration.h
deleted file mode 100644
index cf4d39d247..0000000000
--- a/include/i2c_arbitration.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* I2C arbitration for Chrome EC */
-
-#ifndef __CROS_EC_I2C_ARBITRATION_H
-#define __CROS_EC_I2C_ARBITRATION_H
-
-#include "common.h"
-
-#ifdef CONFIG_I2C_ARBITRATION
-
-/**
- * Claim an I2C port for use in master mode.
- *
- * If this function succeeds, you must later call i2c_release() to release the
- * claim.
- *
- * This function must not be called to claim an already-claimed port.
- *
- * @param port Port to claim (0 for first, 1 for second, etc.)
- * @return 0 if claimed successfully, -1 if it is in use
- */
-int i2c_claim(int port);
-
-/**
- * Release an I2C port (after previously being claimed)
- *
- * This function must not be called to release an already-released port.
- *
- * @param port Port to claim (0 for first, 1 for second, etc.)
- */
-void i2c_release(int port);
-
-#else
-
-static inline int i2c_claim(int port) { return EC_SUCCESS; }
-static inline void i2c_release(int port) {}
-
-#endif
-
-#endif /* __CROS_EC_I2C_ARBITRATION_H */