Revert "Sensors: Checking compass compensation from factory calibrated gain."

This reverts commit a113725.

Author: Joseph Wu

drivers/staging/iio/magnetometer/inv_compass/inv_ami306_core.c

@@ -373,55 +373,6 @@ static ssize_t ami306_rate_show(struct device *dev,
 	return sprintf(buf, "%d\n", 1000 / st->delay);
 }
 
-static ssize_t compass_cali_test(struct device *dev,
-		struct device_attribute *devattr, char *buf)
-{
-	struct iio_dev *indio_dev = dev_get_drvdata(dev);
-	struct inv_ami306_state_s *st = iio_priv(indio_dev);
-	int bufcnt = 0;
-	int ii = 0;
-	int val = 0;
-	char tmpbuf[100];
-
-	/* Check if compass calibration file exist */
-	if (!st->data_chk.fexist)
-		bufcnt += sprintf(tmpbuf,
-			"\nE-compass calibration file EXIST.\n\n");
-	else
-		bufcnt += sprintf(tmpbuf,
-			"\nE-compass calibration file DO NOT EXIST.\n\n");
-
-	strncat(buf, tmpbuf, strlen(tmpbuf));
-
-	/* Check if raw data match the gain from calibration file */
-	for (ii = 0; ii < 3; ii++) {
-		val = (short)(st->data_chk.ori[ii] *
-				st->data_chk.gain[ii] / 100);
-
-		if (val == st->data_chk.post[ii])
-			bufcnt += sprintf(tmpbuf,
-				"[axis-%d] Compensation is matched to the gain.\n",
-				ii);
-		else
-			bufcnt += sprintf(tmpbuf,
-				"[axis-%d] Compensation FAIL. %d != %d",
-					ii, val, st->data_chk.post[ii]);
-
-		strncat(buf, tmpbuf, strlen(tmpbuf));
-	}
-
-	bufcnt += sprintf(tmpbuf,
-		"gain: %d, %d, %d\nori:(%d, %d, %d); post:(%d, %d, %d)\n",
-		st->data_chk.gain[0], st->data_chk.gain[1],
-		st->data_chk.gain[2], st->data_chk.ori[0],
-		st->data_chk.ori[1], st->data_chk.ori[2],
-		st->data_chk.post[0], st->data_chk.post[1],
-		st->data_chk.post[2]);
-
-	strncat(buf, tmpbuf, strlen(tmpbuf));
-
-	return bufcnt;
-}
 
 static void ami306_work_func(struct work_struct *work)
 {
@@ -466,12 +417,10 @@ static const struct iio_chan_spec compass_channels[] = {
 static DEVICE_ATTR(compass_matrix, S_IRUGO, inv_compass_matrix_show, NULL);
 static DEVICE_ATTR(sampling_frequency, S_IRUGO | S_IWUSR, ami306_rate_show,
 		ami306_rate_store);
-static DEVICE_ATTR(compass_cali_test, S_IRUGO, compass_cali_test, NULL);
 
 static struct attribute *inv_ami306_attributes[] = {
 	&dev_attr_compass_matrix.attr,
 	&dev_attr_sampling_frequency.attr,
-	&dev_attr_compass_cali_test.attr,
 	NULL,
 };
 static const struct attribute_group inv_attribute_group = {
@@ -497,8 +446,6 @@ static int inv_ami306_probe(struct i2c_client *client,
 	struct iio_dev *indio_dev;
 	int result;
 	char data;
-	int ii;
-
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
 		result = -ENODEV;
 		goto out_no_free;
@@ -515,12 +462,6 @@ static int inv_ami306_probe(struct i2c_client *client,
 		*(struct mpu_platform_data *)dev_get_platdata(&client->dev);
 	st->delay = 10;
 
-	/* init for loading factory file*/
-	st->data_chk.load_cali = false;
-	st->data_chk.fexist = -1;
-	for (ii = 0; ii < 3; ii++)
-		st->data_chk.gain[ii] = 100;
-
 	/* Make state variables available to all _show and _store functions. */
 	i2c_set_clientdata(client, indio_dev);
 	result = i2c_read(st->i2c, REG_AMI_WIA, 1, &data);

drivers/staging/iio/magnetometer/inv_compass/inv_ami306_iio.h

@@ -71,15 +71,6 @@ struct ami_sensor_parametor {
 	struct ami_interference m_interference;
 };
 
-struct cali_data_check {
-	short ori[3];
-	short post[3];
-	int gain[3];
-	bool load_cali;
-	bool fexist;
-	bool status;
-};
-
 /**
  *  struct inv_ami306_state_s - Driver state variables.
  *  @i2c:		i2c client handle.
@@ -99,9 +90,7 @@ struct inv_ami306_state_s {
 	char fine[3];
 	short compass_data[3];
 	s64 timestamp;
-	struct cali_data_check data_chk;
 };
-
 /* scan element definition */
 enum inv_mpu_scan {
 	INV_AMI306_SCAN_MAGN_X,

drivers/staging/iio/magnetometer/inv_compass/inv_ami306_ring.c

@@ -42,77 +42,7 @@
 #include "sysfs.h"
 
 #include "inv_ami306_iio.h"
-enum Compass_cali_File {
-	AMI30X = 0,
-	AMI306,
-	AMICaliMax
-};
-
-#define AMI30X_CALIBRATION_PATH "/data/sensors/AMI304_Config.ini"
-#define AMI306_CALIBRATION_PATH "/data/sensors/AMI306_Config.ini"
-
-/* function for loading compass calibration file. */
-static int access_cali_file(short *gain, int target)
-{
-	char buf[256];
-	int ret;
-	struct file *fp = NULL;
-	mm_segment_t oldfs;
-	int data[23];
-	int ii;
-
-	oldfs = get_fs();
-	set_fs(get_ds());
-	memset(buf, 0, sizeof(u8)*256);
-
-	if (target == AMI30X)
-		fp = filp_open(AMI30X_CALIBRATION_PATH, O_RDONLY, 0);
-	else if (target == AMI306)
-		fp = filp_open(AMI306_CALIBRATION_PATH, O_RDONLY, 0);
-	else
-		goto LoadFileFail;
-
-	if (!IS_ERR(fp)) {
-
-		pr_info("ami306 open calibration file success\n");
-		ret = fp->f_op->read(fp, buf, sizeof(buf), &fp->f_pos);
-		pr_info("ami306 calibration content is :\n%s\n", buf);
-		sscanf(buf, "%6d\n%6d %6d %6d\n"
-			"%6d %6d %6d\n%6d %6d %6d\n"
-			"%6d %6d %6d\n%6d %6d %6d\n"
-			"%6d %6d %6d\n%6d %6d %6d\n%6d\n",
-			&data[0],
-			&data[1], &data[2], &data[3],
-			&data[4], &data[5], &data[6],
-			&data[7], &data[8], &data[9],
-			&data[10], &data[11], &data[12],
-			&data[13], &data[14], &data[15],
-			&data[16], &data[17], &data[18],
-			&data[19], &data[20], &data[21],
-			&data[22]);
-
-		if ((data[19] > 150) || (data[19] < 50) ||
-		   (data[20] > 150) || (data[20] < 50) ||
-		   (data[21] > 150) || (data[21] < 50)) {
-			for (ii = 0; ii < 3; ii++)
-				gain[ii] = 100;
-		} else{
-			for (ii = 0; ii < 3; ii++)
-				gain[ii] = data[ii + 19];
-		}
-
-		pr_info("gain: %d %d %d\n", gain[0], gain[1], gain[2]);
-
-		return 0;
-	} else{
-		pr_info("Compass compensation: No target File. (%d)\n", target);
-		set_fs(oldfs);
-		return -1;
-	}
 
-LoadFileFail:
-	return -1;
-}
 static int put_scan_to_buf(struct iio_dev *indio_dev, unsigned char *d,
 				short *s, int scan_index) {
 	struct iio_buffer *ring = indio_dev->buffer;
@@ -140,7 +70,6 @@ int inv_read_ami306_fifo(struct iio_dev *indio_dev)
 	char b;
 	char *tmp;
 	s64 tmp_buf[2];
-	int ii;
 
 	result = i2c_smbus_read_i2c_block_data(st->i2c, REG_AMI_STA1, 1, &b);
 	if (result < 0)
@@ -151,27 +80,6 @@ int inv_read_ami306_fifo(struct iio_dev *indio_dev)
 			pr_err("error reading raw\n");
 			goto end_session;
 		}
-
-		if (!st->data_chk.load_cali) {
-			for (ii = 0; ii < AMICaliMax; ii++) {
-				result =
-				access_cali_file(st->data_chk.gain, ii);
-				if (!result) {
-					st->data_chk.fexist = 0;
-					break;
-				}
-			}
-			st->data_chk.load_cali = true;
-		}
-
-		for (ii = 0; ii < 3; ii++) {
-			st->data_chk.ori[ii] = st->compass_data[ii];
-			st->compass_data[ii] =
-				(short)((int)st->compass_data[ii] *
-				st->data_chk.gain[ii] / 100);
-			st->data_chk.post[ii] = st->compass_data[ii];
-		}
-
 		tmp = (unsigned char *)tmp_buf;
 		d_ind = put_scan_to_buf(indio_dev, tmp, st->compass_data,
 						INV_AMI306_SCAN_MAGN_X);