Revert "Input: synaptics_i2c_rmi: Add sensitivity adjust option."

This reverts commit 3929c1894c66d55c076be4e88780ff3205958411.

diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c
index 56cf371eac9325df7414e5a3ff603a6e7ea33361..4ad4cc9cfec3e54953d04448b56706e0a33b80fd 100644 (file)
--- a/drivers/input/touchscreen/synaptics_i2c_rmi.c
+++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c
@@ -43,7 +43,6 @@ struct synaptics_ts_data {
        int snap_down[2];
        int snap_up[2];
        uint32_t flags;
-       int8_t sensitivity_adjust;
        int (*power)(int on);
        struct early_suspend early_suspend;
 };
@@ -66,11 +65,6 @@ static int synaptics_init_panel(struct synaptics_ts_data *ts)
        if (ret < 0)
                printk(KERN_ERR "i2c_smbus_write_byte_data failed for No Clip Z\n");
 
-       ret = i2c_smbus_write_byte_data(ts->client, 0x44,
-                                       ts->sensitivity_adjust);
-       if (ret < 0)
-               pr_err("synaptics_ts: failed to set Sensitivity Adjust\n");
-
 err_page_select_failed:
        ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04); /* page select = 0x04 */
        if (ret < 0)
@@ -322,7 +316,6 @@ static int synaptics_ts_probe(
                while (pdata->version > panel_version)
                        pdata++;
                ts->flags = pdata->flags;
-               ts->sensitivity_adjust = pdata->sensitivity_adjust;
                inactive_area_left = pdata->inactive_left;
                inactive_area_right = pdata->inactive_right;
                inactive_area_top = pdata->inactive_top;

diff --git a/include/linux/synaptics_i2c_rmi.h b/include/linux/synaptics_i2c_rmi.h
index 0e40703807f4d364921b7e3e65dd6b6ed11d96ce..ca51b2fc564d5031e45ae15fd328e6addc720ac4 100644 (file)
--- a/include/linux/synaptics_i2c_rmi.h
+++ b/include/linux/synaptics_i2c_rmi.h
@@ -48,7 +48,6 @@ struct synaptics_i2c_rmi_platform_data {
        uint32_t fuzz_y; /* 0x10000 = screen height */
        int fuzz_p;
        int fuzz_w;
-       int8_t sensitivity_adjust;
 };
 
 #endif /* _LINUX_SYNAPTICS_I2C_RMI_H */