Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

8 files changed, 32 insertions, 91 deletions

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 6662b545e0a9..a47928a2e575 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the Linux device tree
 
-obj-y                   := core.o sys.o interface.o bus.o \
+obj-y                   := core.o sys.o bus.o \
                            driver.o class.o class_simple.o platform.o \
                            cpu.o firmware.o init.o map.o dmapool.o \
                            attribute_container.o transport_class.o
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 2b3902c867da..3cb04bb04c2b 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -390,7 +390,6 @@ void device_release_driver(struct device * dev)
                 sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
                 sysfs_remove_link(&dev->kobj, "driver");
                 list_del_init(&dev->driver_list);
-                device_detach_shutdown(dev);
                 if (drv->remove)
                         drv->remove(dev);
                 dev->driver = NULL;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 268a9c8d168b..fbc223486f81 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -31,8 +31,6 @@ int (*platform_notify_remove)(struct device * dev) = NULL;
 #define to_dev(obj) container_of(obj, struct device, kobj)
 #define to_dev_attr(_attr) container_of(_attr, struct device_attribute, attr)
 
-extern struct attribute * dev_default_attrs[];
-
 static ssize_t
 dev_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
 {
@@ -89,7 +87,6 @@ static void device_release(struct kobject * kobj)
 static struct kobj_type ktype_device = {
         .release        = device_release,
         .sysfs_ops      = &dev_sysfs_ops,
-        .default_attrs  = dev_default_attrs,
 };
 
 
@@ -248,6 +245,7 @@ int device_add(struct device *dev)
 
         if ((error = kobject_add(&dev->kobj)))
                 goto Error;
+        kobject_hotplug(&dev->kobj, KOBJ_ADD);
         if ((error = device_pm_add(dev)))
                 goto PMError;
         if ((error = bus_add_device(dev)))
@@ -260,14 +258,13 @@ int device_add(struct device *dev)
         /* notify platform of device entry */
         if (platform_notify)
                 platform_notify(dev);
-
-        kobject_hotplug(&dev->kobj, KOBJ_ADD);
  Done:
         put_device(dev);
         return error;
  BusError:
         device_pm_remove(dev);
  PMError:
+        kobject_hotplug(&dev->kobj, KOBJ_REMOVE);
         kobject_del(&dev->kobj);
  Error:
         if (parent)
diff --git a/drivers/base/interface.c b/drivers/base/interface.c
deleted file mode 100644
index bd515843a0cb..000000000000
--- a/drivers/base/interface.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * drivers/base/interface.c - common driverfs interface that's exported to
- *      the world for all devices.
- *
- * Copyright (c) 2002-3 Patrick Mochel
- * Copyright (c) 2002-3 Open Source Development Labs
- *
- * This file is released under the GPLv2
- *
- */
-
-#include <linux/device.h>
-#include <linux/err.h>
-#include <linux/stat.h>
-#include <linux/string.h>
-
-/**
- *      detach_state - control the default power state for the device.
- *
- *      This is the state the device enters when it's driver module is
- *      unloaded. The value is an unsigned integer, in the range of 0-4.
- *      '0' indicates 'On', so no action will be taken when the driver is
- *      unloaded. This is the default behavior.
- *      '4' indicates 'Off', meaning the driver core will call the driver's
- *      shutdown method to quiesce the device.
- *      1-3 indicate a low-power state for the device to enter via the
- *      driver's suspend method.
- */
-
-static ssize_t detach_show(struct device * dev, char * buf)
-{
-        return sprintf(buf, "%u\n", dev->detach_state);
-}
-
-static ssize_t detach_store(struct device * dev, const char * buf, size_t n)
-{
-        u32 state;
-        state = simple_strtoul(buf, NULL, 10);
-        if (state > 4)
-                return -EINVAL;
-        dev->detach_state = state;
-        return n;
-}
-
-static DEVICE_ATTR(detach_state, 0644, detach_show, detach_store);
-
-
-struct attribute * dev_default_attrs[] = {
-        &dev_attr_detach_state.attr,
-        NULL,
-};
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index e5eda746f2a6..2e700d795cf1 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,18 +1,7 @@
-
-
-enum {
-        DEVICE_PM_ON,
-        DEVICE_PM1,
-        DEVICE_PM2,
-        DEVICE_PM3,
-        DEVICE_PM_OFF,
-};
-
 /*
  * shutdown.c
  */
 
-extern int device_detach_shutdown(struct device *);
 extern void device_shutdown(void);
 
 
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index f8f5055754d6..26468971ef5a 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -22,8 +22,17 @@ extern int sysdev_resume(void);
 
 int resume_device(struct device * dev)
 {
-        if (dev->bus && dev->bus->resume)
+        if (dev->power.pm_parent
+                        && dev->power.pm_parent->power.power_state) {
+                dev_err(dev, "PM: resume from %d, parent %s still %d\n",
+                        dev->power.power_state,
+                        dev->power.pm_parent->bus_id,
+                        dev->power.pm_parent->power.power_state);
+        }
+        if (dev->bus && dev->bus->resume) {
+                dev_dbg(dev,"resuming\n");
                 return dev->bus->resume(dev);
+        }
         return 0;
 }
 
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
index d1e023fbe169..f50a08be424b 100644
--- a/drivers/base/power/shutdown.c
+++ b/drivers/base/power/shutdown.c
@@ -19,20 +19,6 @@
 extern struct subsystem devices_subsys;
 
 
-int device_detach_shutdown(struct device * dev)
-{
-        if (!dev->detach_state)
-                return 0;
-
-        if (dev->detach_state == DEVICE_PM_OFF) {
-                if (dev->driver && dev->driver->shutdown)
-                        dev->driver->shutdown(dev);
-                return 0;
-        }
-        return dpm_runtime_suspend(dev, dev->detach_state);
-}
-
-
 /**
  * We handle system devices differently - we suspend and shut them
  * down last and resume them first. That way, we don't do anything stupid like
@@ -52,13 +38,12 @@ void device_shutdown(void)
         struct device * dev;
 
         down_write(&devices_subsys.rwsem);
-        list_for_each_entry_reverse(dev, &devices_subsys.kset.list, kobj.entry) {
-                pr_debug("shutting down %s: ", dev->bus_id);
+        list_for_each_entry_reverse(dev, &devices_subsys.kset.list,
+                                kobj.entry) {
                 if (dev->driver && dev->driver->shutdown) {
-                        pr_debug("Ok\n");
+                        dev_dbg(dev, "shutdown\n");
                         dev->driver->shutdown(dev);
-                } else
-                        pr_debug("Ignored.\n");
+                }
         }
         up_write(&devices_subsys.rwsem);
 
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index a0b5cf689e63..0ec44ef840be 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -39,12 +39,25 @@ int suspend_device(struct device * dev, pm_message_t state)
 {
         int error = 0;
 
-        dev_dbg(dev, "suspending\n");
+        if (dev->power.power_state) {
+                dev_dbg(dev, "PM: suspend %d-->%d\n",
+                        dev->power.power_state, state);
+        }
+        if (dev->power.pm_parent
+                        && dev->power.pm_parent->power.power_state) {
+                dev_err(dev,
+                        "PM: suspend %d->%d, parent %s already %d\n",
+                        dev->power.power_state, state,
+                        dev->power.pm_parent->bus_id,
+                        dev->power.pm_parent->power.power_state);
+        }
 
         dev->power.prev_state = dev->power.power_state;
 
-        if (dev->bus && dev->bus->suspend && !dev->power.power_state)
+        if (dev->bus && dev->bus->suspend && !dev->power.power_state) {
+                dev_dbg(dev, "suspending\n");
                 error = dev->bus->suspend(dev, state);
+        }
 
         return error;
 }