aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-05-06 17:50:49 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:12:59 -0400
commitab3bfca7abf3fd0fe41d26d839610a787aa7e587 (patch)
treee62e58beaf9d22d4156b27d4523c3728bf5769bc /drivers/i2c
parentb1296cc48b39355241470ef934a5e2270e3f23bd (diff)
remove software_suspend()
Remove software_suspend() and all its users since pm_suspend(PM_SUSPEND_DISK) should be equivalent and there's no point in having two interfaces for the same thing. The patch also changes the valid_state function to return 0 (false) for PM_SUSPEND_DISK when SOFTWARE_SUSPEND is not configured instead of accepting it and having the whole thing fail later. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/chips/tps65010.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 214fbb1423c5..7ed92dc3d833 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -351,8 +351,10 @@ static void tps65010_interrupt(struct tps65010 *tps)
351#if 0 351#if 0
352 /* REVISIT: this might need its own workqueue 352 /* REVISIT: this might need its own workqueue
353 * plus tweaks including deadlock avoidance ... 353 * plus tweaks including deadlock avoidance ...
354 * also needs to get error handling and probably
355 * an #ifdef CONFIG_SOFTWARE_SUSPEND
354 */ 356 */
355 software_suspend(); 357 pm_suspend(PM_SUSPEND_DISK);
356#endif 358#endif
357 poll = 1; 359 poll = 1;
358 } 360 }