* [patch 2.6.24-rc4] ads7846 stops updating dev->power.power_state
@ 2007-12-04 20:25 David Brownell
0 siblings, 0 replies; only message in thread
From: David Brownell @ 2007-12-04 20:25 UTC (permalink / raw)
To: Andrew Morton; +Cc: dmitry.torokhov, Linux Kernel list
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>
--- pstate.orig/drivers/input/touchscreen/ads7846.c 2007-12-04 09:19:00.000000000 -0800
+++ pstate/drivers/input/touchscreen/ads7846.c 2007-12-04 12:13:11.000000000 -0800
@@ -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;
@@ -203,7 +204,7 @@ static void ads7846_disable(struct ads78
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)
@@ -795,7 +796,7 @@ static int ads7846_suspend(struct spi_de
spin_lock_irq(&ts->lock);
- spi->dev.power.power_state = message;
+ ts->is_suspended = 1;
ads7846_disable(ts);
spin_unlock_irq(&ts->lock);
@@ -810,7 +811,7 @@ static int ads7846_resume(struct spi_dev
spin_lock_irq(&ts->lock);
- spi->dev.power.power_state = PMSG_ON;
+ ts->is_suspended = 0;
ads7846_enable(ts);
spin_unlock_irq(&ts->lock);
@@ -872,7 +873,6 @@ static int __devinit ads7846_probe(struc
}
dev_set_drvdata(&spi->dev, ts);
- spi->dev.power.power_state = PMSG_ON;
ts->spi = spi;
ts->input = input_dev;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-12-04 20:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-12-04 20:25 [patch 2.6.24-rc4] ads7846 stops updating dev->power.power_state David Brownell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.