Skip to content

Commit

Permalink
Input: tsc2005 - remove 'disable' sysfs attribute
Browse files Browse the repository at this point in the history
I believe that enable/disable functionality should not be implemented on
the individual driver level but rather in device core, potentially
reusing parts of PM framework. Therefore the driver-specific "disable"
attribute is removed from the mainline driver.

Tested-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Mar 17, 2011
1 parent 0b950d3 commit 5cb81d1
Showing 1 changed file with 4 additions and 48 deletions.
52 changes: 4 additions & 48 deletions drivers/input/touchscreen/tsc2005.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ struct tsc2005 {

unsigned int x_plate_ohm;

bool disabled;
bool opened;
bool suspended;

Expand Down Expand Up @@ -365,48 +364,6 @@ static void __tsc2005_enable(struct tsc2005 *ts)

}

static ssize_t tsc2005_disable_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi);

return sprintf(buf, "%u\n", ts->disabled);
}

static ssize_t tsc2005_disable_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi);
unsigned long val;
int error;

error = strict_strtoul(buf, 10, &val);
if (error)
return error;

mutex_lock(&ts->mutex);

if (!ts->suspended && ts->opened) {
if (val) {
if (!ts->disabled)
__tsc2005_disable(ts);
} else {
if (ts->disabled)
__tsc2005_enable(ts);
}
}

ts->disabled = !!val;

mutex_unlock(&ts->mutex);

return count;
}
static DEVICE_ATTR(disable, 0664, tsc2005_disable_show, tsc2005_disable_store);

static ssize_t tsc2005_selftest_show(struct device *dev,
struct device_attribute *attr,
char *buf)
Expand Down Expand Up @@ -489,7 +446,6 @@ static ssize_t tsc2005_selftest_show(struct device *dev,
static DEVICE_ATTR(selftest, S_IRUGO, tsc2005_selftest_show, NULL);

static struct attribute *tsc2005_attrs[] = {
&dev_attr_disable.attr,
&dev_attr_selftest.attr,
NULL
};
Expand Down Expand Up @@ -567,7 +523,7 @@ static int tsc2005_open(struct input_dev *input)

mutex_lock(&ts->mutex);

if (!ts->suspended && !ts->disabled)
if (!ts->suspended)
__tsc2005_enable(ts);

ts->opened = true;
Expand All @@ -583,7 +539,7 @@ static void tsc2005_close(struct input_dev *input)

mutex_lock(&ts->mutex);

if (!ts->suspended && !ts->disabled)
if (!ts->suspended)
__tsc2005_disable(ts);

ts->opened = false;
Expand Down Expand Up @@ -743,7 +699,7 @@ static int tsc2005_suspend(struct device *dev)

mutex_lock(&ts->mutex);

if (!ts->suspended && !ts->disabled && ts->opened)
if (!ts->suspended && ts->opened)
__tsc2005_disable(ts);

ts->suspended = true;
Expand All @@ -760,7 +716,7 @@ static int tsc2005_resume(struct device *dev)

mutex_lock(&ts->mutex);

if (ts->suspended && !ts->disabled && ts->opened)
if (ts->suspended && ts->opened)
__tsc2005_enable(ts);

ts->suspended = false;
Expand Down

0 comments on commit 5cb81d1

Please sign in to comment.