Merged bluetooth and ST mods from mattis_bt_work.

Change-Id: Ic904469eae89e5678a502e78309b30ab9715cd41

1 files changed, 0 insertions, 72 deletions

diff --git a/drivers/iio/imu-aosp/inv_mpu6515/inv_test/inv_counters.h b/drivers/iio/imu-aosp/inv_mpu6515/inv_test/inv_counters.h
deleted file mode 100755
index d60dac9d97b..00000000000
--- a/drivers/iio/imu-aosp/inv_mpu6515/inv_test/inv_counters.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * @file  inv_counters.h
- * @brief Debug file to keep track of various counters for the InvenSense
- *        sensor drivers.
- *
- * @version 0.1
- */
-
-#ifndef _INV_COUNTERS_H_
-#define _INV_COUNTERS_H_
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/sysfs.h>
-#include <linux/string.h>
-#include <linux/jiffies.h>
-#include <linux/spinlock.h>
-
-#ifdef CONFIG_INV_TESTING
-
-enum irqtype {
-	IRQ_MPU,
-	IRQ_ACCEL,
-	IRQ_COMPASS
-};
-
-#define INV_I2C_INC_MPUREAD(x)		inv_iio_counters_mpuread(x)
-#define INV_I2C_INC_MPUWRITE(x)		inv_iio_counters_mpuwrite(x)
-#define INV_I2C_INC_ACCELREAD(x)	inv_iio_counters_accelread(x)
-#define INV_I2C_INC_ACCELWRITE(x)	inv_iio_counters_accelwrite(x)
-#define INV_I2C_INC_COMPASSREAD(x)	inv_iio_counters_compassread(x)
-#define INV_I2C_INC_COMPASSWRITE(x)	inv_iio_counters_compasswrite(x)
-
-#define INV_I2C_INC_TEMPREAD(x)		inv_iio_counters_tempread(x)
-
-#define INV_I2C_SETIRQ(type, irq)	inv_iio_counters_set_i2cirq(type, irq)
-#define INV_I2C_INC_COMPASSIRQ()	inv_iio_counters_compassirq()
-#define INV_I2C_INC_ACCELIRQ()		inv_iio_counters_accelirq()
-
-void inv_iio_counters_mpuread(int count);
-void inv_iio_counters_mpuwrite(int count);
-void inv_iio_counters_accelread(int count);
-void inv_iio_counters_accelwrite(int count);
-void inv_iio_counters_compassread(int count);
-void inv_iio_counters_compasswrite(int count);
-
-void inv_iio_counters_tempread(int count);
-
-void inv_iio_counters_set_i2cirq(enum irqtype type, int irq);
-void inv_iio_counters_compassirq(void);
-void inv_iio_counters_accelirq(void);
-
-#else
-
-#define INV_I2C_INC_MPUREAD(x)
-#define INV_I2C_INC_MPUWRITE(x)
-#define INV_I2C_INC_ACCELREAD(x)
-#define INV_I2C_INC_ACCELWRITE(x)
-#define INV_I2C_INC_COMPASSREAD(x)
-#define INV_I2C_INC_COMPASSWRITE(x)
-
-#define INV_I2C_INC_TEMPREAD(x)
-
-#define INV_I2C_SETIRQ(type, irq)
-#define INV_I2C_INC_COMPASSIRQ()
-#define INV_I2C_INC_ACCELIRQ()
-
-#endif /* CONFIG_INV_TESTING */
-
-#endif /* _INV_COUNTERS_H_ */
-