diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:11 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:11 +0000 |
| commit | f39594d4998c1b4e7fb4de3a5d5936f5966499a8 (patch) | |
| tree | 2b806a8c7f8dcb9f4a5e0b316cafbcc4ef3f0b12 /drivers/video | |
| parent | 105a84e9504f7a35b5b4d2c2560d86937bc4027d (diff) | |
fix-remove-resume-dependencies-on-pmu-for-pmu-children.patch
All that stuff should be enforced by device tree now, out with it
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/display/jbt6k74.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c index 9570543fc3d..807d6b538f7 100644 --- a/drivers/video/display/jbt6k74.c +++ b/drivers/video/display/jbt6k74.c @@ -674,11 +674,6 @@ static int __devexit jbt_remove(struct spi_device *spi) static int jbt_suspend(struct spi_device *spi, pm_message_t state) { struct jbt_info *jbt = dev_get_drvdata(&spi->dev); - struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data; - - /* platform can register resume dependencies here, if any */ - if (jbt6k74_pdata->suspending) - (jbt6k74_pdata->suspending)(0, spi); /* Save mode for resume */ jbt->last_state = jbt->state; @@ -697,10 +692,6 @@ int jbt6k74_resume(struct spi_device *spi) struct jbt_info *jbt = dev_get_drvdata(&spi->dev); struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data; - if (jbt6k74_pdata->all_dependencies_resumed) - if (!(jbt6k74_pdata->all_dependencies_resumed)(0)) - return 0; - /* we can get called twice with all dependencies resumed if our core * resume callback is last of all. Protect against doing anything twice */ |