Skip to content

Commit

Permalink
Revert "taos: Add proximity sensor wake lock"
Browse files Browse the repository at this point in the history
This reverts commit 4a45f0d.
  • Loading branch information
burstlam committed Mar 7, 2012
1 parent f191694 commit f72a208
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/i2c/chips/taos.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Wenn Wer Was
#include <linux/i2c/PS_ALS_common.h>
#include <linux/input.h>
#include <linux/miscdevice.h>
#include <linux/wakelock.h>


#define TAOS_INT_GPIO 42
Expand Down Expand Up @@ -129,7 +128,6 @@ static void taos_report_value(int mask);
static int calc_distance(int value);
static int enable_light_and_proximity(int mask);
static void taos_chip_diff_settings(void);
static struct wake_lock taos_wake_lock;
static int light_on=0;
static int prox_on = 0;

Expand Down Expand Up @@ -516,7 +514,6 @@ static int __init taos_init(void) {
printk(KERN_ERR "TAOS: i2c_add_driver() failed in taos_init(),%d\n",ret);
return (ret);
}
wake_lock_init(&taos_wake_lock, WAKE_LOCK_SUSPEND, "taos");
//pr_crit(TAOS_TAG "%s:%d\n",__func__,ret);
return (ret);
}
Expand Down Expand Up @@ -980,9 +977,6 @@ static int enable_light_and_proximity(int mask)
printk(KERN_ERR "TAOS: i2c_smbus_write_byte_data failed in ioctl prox_on\n");
return (ret);
}
// Use wake lock to stop suspending during calls.
wake_lock(&taos_wake_lock);
pr_crit(TAOS_TAG "get wake lock");
return ret;
}
if(mask==0x20)
Expand Down Expand Up @@ -1024,8 +1018,6 @@ static int enable_light_and_proximity(int mask)
printk(KERN_ERR "TAOS: i2c_smbus_write_byte_data failed in ioctl prox_off\n");
return (ret);
}
wake_unlock(&taos_wake_lock);
pr_crit(TAOS_TAG "release wake lock");
return ret;
}
return ret;
Expand Down

0 comments on commit f72a208

Please sign in to comment.