Re: [PATCH] DRIVER MODEL: Get rid of the obsolete tri-level suspend/resume callbacks

[Takashi Iwai]

At Fri, 28 Oct 2005 12:13:27 +0100,
Russell King wrote:
> 
> On Fri, Oct 28, 2005 at 12:04:11PM +0200, Takashi Iwai wrote:
> > At Thu, 27 Oct 2005 23:30:27 -0700,
> > Greg KH wrote:
> > > 
> > > --- a/Documentation/driver-model/driver.txt
> > > +++ b/Documentation/driver-model/driver.txt
> > > @@ -196,67 +196,11 @@ it into a supported low-power state.
> > >  
> > >  	int	(*suspend)	(struct device * dev, pm_message_t state, u32 level);
> > >  
> > 
> > Shouldn't this be also changed without level argument?
> > 
> > 
> > > +suspend is called to put the device in a low power state.
> > >  
> > >  	int	(*resume)	(struct device * dev, u32 level);
> > >  
> > 
> > Ditto.
> 
> Probably.  Please send a patch.

OK, here we go:


[PATCH] Fix documentation of driver suspend/resume callbacks

Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
---
diff --git a/Documentation/driver-model/driver.txt b/Documentation/driver-model/driver.txt
--- a/Documentation/driver-model/driver.txt
+++ b/Documentation/driver-model/driver.txt
@@ -14,8 +14,8 @@ struct device_driver {
         int     (*probe)        (struct device * dev);
         int     (*remove)       (struct device * dev);
 
-        int     (*suspend)      (struct device * dev, pm_message_t state, u32 level);
-        int     (*resume)       (struct device * dev, u32 level);
+        int     (*suspend)      (struct device * dev, pm_message_t state);
+        int     (*resume)       (struct device * dev);
 };
 
 
@@ -194,11 +194,11 @@ device; i.e. anything in the device's dr
 If the device is still present, it should quiesce the device and place
 it into a supported low-power state.
 
-	int	(*suspend)	(struct device * dev, pm_message_t state, u32 level);
+	int	(*suspend)	(struct device * dev, pm_message_t state);
 
 suspend is called to put the device in a low power state.
 
-	int	(*resume)	(struct device * dev, u32 level);
+	int	(*resume)	(struct device * dev);
 
 Resume is used to bring a device back from a low power state.
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/