diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:38:13 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:38:13 -0500 |
| commit | 87199134b4a85de56a7508c551ab3b3a3ee35035 (patch) | |
| tree | f7b0d0b4bce377c336a3c8cda0be762d29556cc7 /drivers/base/platform.c | |
| parent | ea37ccea66e6bdd9f3571418b6461850088c114e (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 361e204209eb..d597c922af11 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -10,12 +10,15 @@ * information. */ -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/module.h> #include <linux/init.h> #include <linux/dma-mapping.h> #include <linux/bootmem.h> #include <linux/err.h> +#include <linux/slab.h> + +#include "base.h" struct device platform_bus = { .bus_id = "platform", @@ -279,13 +282,9 @@ static int platform_suspend(struct device * dev, pm_message_t state) { int ret = 0; - if (dev->driver && dev->driver->suspend) { - ret = dev->driver->suspend(dev, state, SUSPEND_DISABLE); - if (ret == 0) - ret = dev->driver->suspend(dev, state, SUSPEND_SAVE_STATE); - if (ret == 0) - ret = dev->driver->suspend(dev, state, SUSPEND_POWER_DOWN); - } + if (dev->driver && dev->driver->suspend) + ret = dev->driver->suspend(dev, state); + return ret; } @@ -293,13 +292,9 @@ static int platform_resume(struct device * dev) { int ret = 0; - if (dev->driver && dev->driver->resume) { - ret = dev->driver->resume(dev, RESUME_POWER_ON); - if (ret == 0) - ret = dev->driver->resume(dev, RESUME_RESTORE_STATE); - if (ret == 0) - ret = dev->driver->resume(dev, RESUME_ENABLE); - } + if (dev->driver && dev->driver->resume) + ret = dev->driver->resume(dev); + return ret; } |