[patch 2.6.12-rc4] remove driver model detach_state

[patch 2.6.12-rc4] remove driver model detach_state

[David Brownell]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

This mechanism has never AFAICT been used, and I asked a while back
if anyone knew of uses ... no takers, even though it's been in the
kernel for almost two years by now.

Here's a patch to remove the thing.  AFAICT, suitable to merge ASAP;
it reduces sysfs size impact, and is a net code shrink.

- Dave

[-- Attachment #2: rm-detach-state.patch --]
[-- Type: text/x-diff, Size: 8169 bytes --]

The driver model has a "detach_state" mechanism that:

 - Has never been used by any in-kernel drive;
 - Is superfluous, since driver remove() methods can do the same thing;
 - Became buggy when the suspend() parameter changed semantics and type;
 - Could self-deadlock when called from certain suspend contexts;
 - Is effectively wasted documentation, object code, and headspace.
 
This removes that "detach_state" mechanism; net code shrink, as well
as a per-device saving in the driver model and sysfs.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

--- g26.orig/include/linux/device.h	2005-05-12 11:28:56.000000000 -0700
+++ g26/include/linux/device.h	2005-05-12 11:34:55.000000000 -0700
@@ -273,9 +273,6 @@
 					   BIOS data relevant to device) */
 	struct dev_pm_info	power;
 
-	u32		detach_state;	/* State to enter when device is
-					   detached from its driver. */
-
 	u64		*dma_mask;	/* dma mask (if dma'able device) */
 	u64		coherent_dma_mask;/* Like dma_mask, but for
 					     alloc_coherent mappings as
--- g26.orig/drivers/base/power/power.h	2005-05-12 11:28:56.000000000 -0700
+++ g26/drivers/base/power/power.h	2005-05-12 11:35:23.000000000 -0700
@@ -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);
 
 
--- g26.orig/drivers/base/power/shutdown.c	2005-05-12 11:28:56.000000000 -0700
+++ g26/drivers/base/power/shutdown.c	2005-05-12 11:34:55.000000000 -0700
@@ -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
--- g26.orig/drivers/base/bus.c	2005-05-12 11:28:56.000000000 -0700
+++ g26/drivers/base/bus.c	2005-05-12 11:34:55.000000000 -0700
@@ -390,7 +390,6 @@
 		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;
--- g26.orig/drivers/base/Makefile	2005-05-12 11:28:56.000000000 -0700
+++ g26/drivers/base/Makefile	2005-05-12 11:34:55.000000000 -0700
@@ -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
--- g26.orig/drivers/base/interface.c	2005-05-12 11:28:56.000000000 -0700
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -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,
-};
--- g26.orig/drivers/base/core.c	2005-05-07 18:15:45.000000000 -0700
+++ g26/drivers/base/core.c	2005-05-12 11:36:29.000000000 -0700
@@ -31,8 +31,6 @@
 #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 struct kobj_type ktype_device = {
 	.release	= device_release,
 	.sysfs_ops	= &dev_sysfs_ops,
-	.default_attrs	= dev_default_attrs,
 };
 
 
--- g26.orig/Documentation/filesystems/sysfs-pci.txt	2005-05-07 18:15:24.000000000 -0700
+++ g26/Documentation/filesystems/sysfs-pci.txt	2005-05-12 11:40:20.000000000 -0700
@@ -7,7 +7,6 @@
      |-- 0000:17:00.0
      |   |-- class
      |   |-- config
-     |   |-- detach_state
      |   |-- device
      |   |-- irq
      |   |-- local_cpus
@@ -19,7 +18,7 @@
      |   |-- subsystem_device
      |   |-- subsystem_vendor
      |   `-- vendor
-     `-- detach_state
+     `-- ...
 
 The topmost element describes the PCI domain and bus number.  In this case,
 the domain number is 0000 and the bus number is 17 (both values are in hex).
@@ -31,7 +30,6 @@
        ----		   --------
        class		   PCI class (ascii, ro)
        config		   PCI config space (binary, rw)
-       detach_state	   connection status (bool, rw)
        device		   PCI device (ascii, ro)
        irq		   IRQ number (ascii, ro)
        local_cpus	   nearby CPU mask (cpumask, ro)
@@ -85,4 +83,4 @@
 
 Legacy resources are protected by the HAVE_PCI_LEGACY define.  Platforms
 wishing to support legacy functionality should define it and provide
-pci_legacy_read, pci_legacy_write and pci_mmap_legacy_page_range functions.
\ No newline at end of file
+pci_legacy_read, pci_legacy_write and pci_mmap_legacy_page_range functions.
--- g26.orig/Documentation/power/devices.txt	2005-05-07 18:15:24.000000000 -0700
+++ g26/Documentation/power/devices.txt	2005-05-12 11:38:02.000000000 -0700
@@ -207,27 +207,6 @@
 #READY_AFTER_RESUME
 #
 
-Driver Detach Power Management
-
-The kernel now supports the ability to place a device in a low-power
-state when it is detached from its driver, which happens when its
-module is removed. 
-
-Each device contains a 'detach_state' file in its sysfs directory
-which can be used to control this state. Reading from this file
-displays what the current detach state is set to. This is 0 (On) by
-default. A user may write a positive integer value to this file in the
-range of 1-4 inclusive. 
-
-A value of 1-3 will indicate the device should be placed in that
-low-power state, which will cause ->suspend() to be called for that
-device. A value of 4 indicates that the device should be shutdown, so
-->shutdown() will be called for that device. 
-
-The driver is responsible for reinitializing the device when the
-module is re-inserted during it's ->probe() (or equivalent) method. 
-The driver core will not call any extra functions when binding the
-device to the driver. 
 
 pm_message_t meaning
 
--- g26.orig/Documentation/powerpc/hvcs.txt	2005-05-07 18:15:24.000000000 -0700
+++ g26/Documentation/powerpc/hvcs.txt	2005-05-12 11:40:58.000000000 -0700
@@ -347,8 +347,8 @@
 looks like the following:
 
 	Pow5:/sys/bus/vio/drivers/hvcs/30000004 # ls
-	.   current_vty   devspec  name          partner_vtys
-	..  detach_state  index    partner_clcs  vterm_state
+	.   current_vty   devspec       name          partner_vtys
+	..  index         partner_clcs  vterm_state
 
 Each entry is provided, by default with a "name" attribute.  Reading the
 "name" attribute will reveal the device type as shown in the following

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [patch 2.6.12-rc4] remove driver model detach_state

[Alan Stern]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 652 bytes --]

On Thu, 12 May 2005, David Brownell wrote:

> This mechanism has never AFAICT been used, and I asked a while back
> if anyone knew of uses ... no takers, even though it's been in the
> kernel for almost two years by now.
> 
> Here's a patch to remove the thing.  AFAICT, suitable to merge ASAP;
> it reduces sysfs size impact, and is a net code shrink.

Note that for Greg's "driver" tree, some of the changes you made to bus.c 
will have to apply to dd.c instead.  Maybe Greg will fix this up by 
himself; I still don't know how he manages to juggle multiple conflicting 
source trees...

On the whole this looks like a good thing to do.

Alan Stern


[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [patch 2.6.12-rc4] remove driver model detach_state

[Greg KH]

[-- Attachment #1: Type: text/plain, Size: 815 bytes --]

On Thu, May 12, 2005 at 03:31:22PM -0400, Alan Stern wrote:
> On Thu, 12 May 2005, David Brownell wrote:
> 
> > This mechanism has never AFAICT been used, and I asked a while back
> > if anyone knew of uses ... no takers, even though it's been in the
> > kernel for almost two years by now.
> > 
> > Here's a patch to remove the thing.  AFAICT, suitable to merge ASAP;
> > it reduces sysfs size impact, and is a net code shrink.
> 
> Note that for Greg's "driver" tree, some of the changes you made to bus.c 
> will have to apply to dd.c instead.  Maybe Greg will fix this up by 
> himself; I still don't know how he manages to juggle multiple conflicting 
> source trees...

Don't worry, I can handle it :)

> On the whole this looks like a good thing to do.

I agree.  Will apply it later this evening.

greg k-h

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [patch 2.6.12-rc4] remove driver model detach_state

[Adam Belay]

[-- Attachment #1: Type: text/plain, Size: 2053 bytes --]

On Thu, May 12, 2005 at 01:37:05PM -0700, Greg KH wrote:
> On Thu, May 12, 2005 at 03:31:22PM -0400, Alan Stern wrote:
> > On Thu, 12 May 2005, David Brownell wrote:
> > 
> > > This mechanism has never AFAICT been used, and I asked a while back
> > > if anyone knew of uses ... no takers, even though it's been in the
> > > kernel for almost two years by now.
> > > 
> > > Here's a patch to remove the thing.  AFAICT, suitable to merge ASAP;
> > > it reduces sysfs size impact, and is a net code shrink.
> > 
> > Note that for Greg's "driver" tree, some of the changes you made to bus.c 
> > will have to apply to dd.c instead.  Maybe Greg will fix this up by 
> > himself; I still don't know how he manages to juggle multiple conflicting 
> > source trees...
> 
> Don't worry, I can handle it :)
> 
> > On the whole this looks like a good thing to do.
> 
> I agree.  Will apply it later this evening.
> 
> greg k-h

Although I agree with this patch, I think it's important that we don't
forget about the code's original intentions.  When manual driver binding
and unbinding is supported, it would be nice if we could specify a detach
state.  My guess is that this should only include "on" or "off", but not
any intermediate states.

->remove isn't good enough, as the driver developer makes the decision
"let's turn off the device before detaching" or "let's leave it on".
This will vary between implementations. I think it may be better to
allow the user to specify this.

Finally, if the device is disabled, the configuration (e.g. PCI config
space) may need to be restored for the device to work on a future
driver.  This seems like a tricky problem if the driver is removed.

Selective suspend may be a better alternative, in which case, we need to
decide if it will unregister class devices etc. (as I suggested earlier)
or just do a somewhat regular device_suspend().

Driver binding/unbinding and requests to disable a device play an
interesting role in power management.  It would be nice if we could
define some goals for this.

Thanks,
Adam


[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [patch 2.6.12-rc4] remove driver model detach_state

[David Brownell]

[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]

On Thursday 12 May 2005 3:06 pm, Adam Belay wrote:
> 
> Although I agree with this patch, I think it's important that we don't
> forget about the code's original intentions.  When manual driver binding
> and unbinding is supported, it would be nice if we could specify a detach
> state.  My guess is that this should only include "on" or "off", but not
> any intermediate states.
> 
> ->remove isn't good enough, as the driver developer makes the decision
> "let's turn off the device before detaching" or "let's leave it on".
> This will vary between implementations. I think it may be better to
> allow the user to specify this.

Users haven't yet needed it ... or sysadmins either.  I don't see
why this should need any policy decisions at all.  If unused/idle
devices would just stay in low power modes all the time, then the
only issue would be buggy hardware ... and buggy hardware calls for
hardware-specific workarounds, always.  (Either in infrastructure
quirk code, or in the devices' drivers.)

For example, lots of ARM chips (in embedded hardware) leave most
things unclocked, and where relevant also powered down, until they're
needed.  That's just the way things are ... reset powers things
down, the bootloader (maybe something like U-Boot) turns on enough
to get Linux started, and then Linux turns on other things as
needed.

Many PCI devices could do the same thing, and stay in D3hot state
until some more active mode is needed.


> Finally, if the device is disabled, the configuration (e.g. PCI config
> space) may need to be restored for the device to work on a future
> driver.  This seems like a tricky problem if the driver is removed.

Drivers are expected to initialize using the current hardware state.
If they can't, it's a driver bug.  They normally leave PCI config
space alone.

- Dave

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

patch driver-remove-detach_state.patch added to gregkh-2.6 tree

[gregkh]

[-- Attachment #1: Type: text/plain, Size: 10439 bytes --]


This is a note to let you know that I've just added the patch titled

     Subject: Driver core: remove driver model detach_state

to my gregkh-2.6 tree.  Its filename is

     driver-remove-detach_state.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Patches currently in gregkh-2.6 which might be from david-b@pacbell.net are

driver/driver-pm-diag-update.patch
driver/driver-remove-detach_state.patch
usb/usb-omap_udc_cleanups.patch
usb/usb-ethernet_gadget_cleanups.patch
usb/usb-rndis_cleanups.patch
usb/usb-gadget-kconfig.patch
usb/usb-dummy_hcd-otg.patch
usb/usb-ohci_reboot_notifier.patch
usb/usb-usbtest.patch
usb/usb-urb_documentation.patch
usb/usb-ehci-minor-updates.patch
usb/usb-isp116x-hcd-add.patch
usb/usb-usbnet-fixes.patch
usb/usb-omap_udc_update.patch
usb/usb-turn-a-user-mode-driver-error-into-a-hard-error.patch
usb/usb-gadget-pxa2xx_udc-updates.patch
usb/usb-gadget-setup-api-change-goku_udc.patch
usb/usb-gadget-setup-api-change-net2280.patch
usb/usb-gadget-setup-api-change.patch
usb/usb-ehci-suspend-stop-timer.patch


>From david-b@pacbell.net Thu May 12 12:11:25 2005
From: David Brownell <david-b@pacbell.net>
To: Linux-pm mailing list <linux-pm@lists.osdl.org>
Subject: Driver core: remove driver model detach_state
Date: Thu, 12 May 2005 12:06:27 -0700
Cc: Greg KH <greg@kroah.com>
Message-Id: <200505121206.27981.david-b@pacbell.net>

The driver model has a "detach_state" mechanism that:

 - Has never been used by any in-kernel drive;
 - Is superfluous, since driver remove() methods can do the same thing;
 - Became buggy when the suspend() parameter changed semantics and type;
 - Could self-deadlock when called from certain suspend contexts;
 - Is effectively wasted documentation, object code, and headspace.
 
This removes that "detach_state" mechanism; net code shrink, as well
as a per-device saving in the driver model and sysfs.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 Documentation/filesystems/sysfs-pci.txt |    6 +--
 Documentation/power/devices.txt         |   21 -------------
 Documentation/powerpc/hvcs.txt          |    4 +-
 drivers/base/Makefile                   |    2 -
 drivers/base/bus.c                      |    1 
 drivers/base/core.c                     |    3 -
 drivers/base/interface.c                |   51 --------------------------------
 drivers/base/power/power.h              |   11 ------
 drivers/base/power/shutdown.c           |   16 ----------
 include/linux/device.h                  |    3 -
 10 files changed, 5 insertions(+), 113 deletions(-)

--- gregkh-2.6.orig/include/linux/device.h	2005-05-12 16:38:42.000000000 -0700
+++ gregkh-2.6/include/linux/device.h	2005-05-12 16:47:07.000000000 -0700
@@ -273,9 +273,6 @@
 					   BIOS data relevant to device) */
 	struct dev_pm_info	power;
 
-	u32		detach_state;	/* State to enter when device is
-					   detached from its driver. */
-
 	u64		*dma_mask;	/* dma mask (if dma'able device) */
 	u64		coherent_dma_mask;/* Like dma_mask, but for
 					     alloc_coherent mappings as
--- gregkh-2.6.orig/drivers/base/power/power.h	2005-03-01 23:38:34.000000000 -0800
+++ gregkh-2.6/drivers/base/power/power.h	2005-05-12 16:47:07.000000000 -0700
@@ -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);
 
 
--- gregkh-2.6.orig/drivers/base/power/shutdown.c	2005-05-12 16:38:56.000000000 -0700
+++ gregkh-2.6/drivers/base/power/shutdown.c	2005-05-12 16:48:10.000000000 -0700
@@ -19,22 +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_dbg(dev, "shutdown\n");
-			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
--- gregkh-2.6.orig/drivers/base/bus.c	2005-05-12 16:38:42.000000000 -0700
+++ gregkh-2.6/drivers/base/bus.c	2005-05-12 16:47:07.000000000 -0700
@@ -390,7 +390,6 @@
 		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;
--- gregkh-2.6.orig/drivers/base/Makefile	2005-05-12 16:38:41.000000000 -0700
+++ gregkh-2.6/drivers/base/Makefile	2005-05-12 16:47:07.000000000 -0700
@@ -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
--- gregkh-2.6.orig/drivers/base/interface.c	2005-03-01 23:37:48.000000000 -0800
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -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,
-};
--- gregkh-2.6.orig/drivers/base/core.c	2005-05-12 16:38:42.000000000 -0700
+++ gregkh-2.6/drivers/base/core.c	2005-05-12 16:47:07.000000000 -0700
@@ -31,8 +31,6 @@
 #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 struct kobj_type ktype_device = {
 	.release	= device_release,
 	.sysfs_ops	= &dev_sysfs_ops,
-	.default_attrs	= dev_default_attrs,
 };
 
 
--- gregkh-2.6.orig/Documentation/filesystems/sysfs-pci.txt	2005-03-01 23:38:13.000000000 -0800
+++ gregkh-2.6/Documentation/filesystems/sysfs-pci.txt	2005-05-12 16:47:07.000000000 -0700
@@ -7,7 +7,6 @@
      |-- 0000:17:00.0
      |   |-- class
      |   |-- config
-     |   |-- detach_state
      |   |-- device
      |   |-- irq
      |   |-- local_cpus
@@ -19,7 +18,7 @@
      |   |-- subsystem_device
      |   |-- subsystem_vendor
      |   `-- vendor
-     `-- detach_state
+     `-- ...
 
 The topmost element describes the PCI domain and bus number.  In this case,
 the domain number is 0000 and the bus number is 17 (both values are in hex).
@@ -31,7 +30,6 @@
        ----		   --------
        class		   PCI class (ascii, ro)
        config		   PCI config space (binary, rw)
-       detach_state	   connection status (bool, rw)
        device		   PCI device (ascii, ro)
        irq		   IRQ number (ascii, ro)
        local_cpus	   nearby CPU mask (cpumask, ro)
@@ -85,4 +83,4 @@
 
 Legacy resources are protected by the HAVE_PCI_LEGACY define.  Platforms
 wishing to support legacy functionality should define it and provide
-pci_legacy_read, pci_legacy_write and pci_mmap_legacy_page_range functions.
\ No newline at end of file
+pci_legacy_read, pci_legacy_write and pci_mmap_legacy_page_range functions.
--- gregkh-2.6.orig/Documentation/power/devices.txt	2005-05-09 09:06:53.000000000 -0700
+++ gregkh-2.6/Documentation/power/devices.txt	2005-05-12 16:47:07.000000000 -0700
@@ -207,27 +207,6 @@
 #READY_AFTER_RESUME
 #
 
-Driver Detach Power Management
-
-The kernel now supports the ability to place a device in a low-power
-state when it is detached from its driver, which happens when its
-module is removed. 
-
-Each device contains a 'detach_state' file in its sysfs directory
-which can be used to control this state. Reading from this file
-displays what the current detach state is set to. This is 0 (On) by
-default. A user may write a positive integer value to this file in the
-range of 1-4 inclusive. 
-
-A value of 1-3 will indicate the device should be placed in that
-low-power state, which will cause ->suspend() to be called for that
-device. A value of 4 indicates that the device should be shutdown, so
-->shutdown() will be called for that device. 
-
-The driver is responsible for reinitializing the device when the
-module is re-inserted during it's ->probe() (or equivalent) method. 
-The driver core will not call any extra functions when binding the
-device to the driver. 
 
 pm_message_t meaning
 
--- gregkh-2.6.orig/Documentation/powerpc/hvcs.txt	2005-03-01 23:37:52.000000000 -0800
+++ gregkh-2.6/Documentation/powerpc/hvcs.txt	2005-05-12 16:47:07.000000000 -0700
@@ -347,8 +347,8 @@
 looks like the following:
 
 	Pow5:/sys/bus/vio/drivers/hvcs/30000004 # ls
-	.   current_vty   devspec  name          partner_vtys
-	..  detach_state  index    partner_clcs  vterm_state
+	.   current_vty   devspec       name          partner_vtys
+	..  index         partner_clcs  vterm_state
 
 Each entry is provided, by default with a "name" attribute.  Reading the
 "name" attribute will reveal the device type as shown in the following

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]