Skip to content

Commit

Permalink
Input: ads7846 - stop updating dev->power.power_state
Browse files Browse the repository at this point in the history
This stops the ads7846 driver from using dev->power.power_state; that field is
deprecated (overdue for removal) and the only reason to update it was to make
the /sys/devices/.../power/state files (now removed) work better.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
David Brownell authored and Dmitry Torokhov committed Jan 21, 2008
1 parent 3b04a61 commit fbb38e3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/input/touchscreen/ads7846.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ struct ads7846 {
// FIXME remove "irq_disabled"
unsigned irq_disabled:1; /* P: lock */
unsigned disabled:1;
unsigned is_suspended:1;

int (*filter)(void *data, int data_idx, int *val);
void *filter_data;
Expand Down Expand Up @@ -203,7 +204,7 @@ static void ads7846_disable(struct ads7846 *ts);
static int device_suspended(struct device *dev)
{
struct ads7846 *ts = dev_get_drvdata(dev);
return dev->power.power_state.event != PM_EVENT_ON || ts->disabled;
return ts->is_suspended || ts->disabled;
}

static int ads7846_read12_ser(struct device *dev, unsigned command)
Expand Down Expand Up @@ -795,7 +796,7 @@ static int ads7846_suspend(struct spi_device *spi, pm_message_t message)

spin_lock_irq(&ts->lock);

spi->dev.power.power_state = message;
ts->is_suspended = 1;
ads7846_disable(ts);

spin_unlock_irq(&ts->lock);
Expand All @@ -810,7 +811,7 @@ static int ads7846_resume(struct spi_device *spi)

spin_lock_irq(&ts->lock);

spi->dev.power.power_state = PMSG_ON;
ts->is_suspended = 0;
ads7846_enable(ts);

spin_unlock_irq(&ts->lock);
Expand Down Expand Up @@ -872,7 +873,6 @@ static int __devinit ads7846_probe(struct spi_device *spi)
}

dev_set_drvdata(&spi->dev, ts);
spi->dev.power.power_state = PMSG_ON;

ts->spi = spi;
ts->input = input_dev;
Expand Down

0 comments on commit fbb38e3

Please sign in to comment.