make idedisk_suspend()/idedisk_resume() conditional on CONFIG_SOFTWARE_SUSPEND

make idedisk_suspend()/idedisk_resume() conditional on CONFIG_SOFTWARE_SUSPEND

[William Lee Irwin III]

ide-disk.c gets the following warning:

drivers/ide/ide-disk.c:1614: warning: `idedisk_suspend' defined but not used
drivers/ide/ide-disk.c:1651: warning: `idedisk_resume' defined but not used


--- akpm-2.5.41-3/drivers/ide/ide-disk.c	2002-10-11 06:09:31.000000000 -0700
+++ wli-2.5.41-3/drivers/ide/ide-disk.c	2002-10-11 06:53:58.000000000 -0700
@@ -1610,6 +1610,7 @@
 #endif
 }
 
+#ifdef CONFIG_SOFTWARE_SUSPEND
 static int idedisk_suspend(struct device *dev, u32 state, u32 level)
 {
 	ide_drive_t *drive = dev->driver_data;
@@ -1659,7 +1660,7 @@
 	drive->blocked = 0;
 	return 0;
 }
-
+#endif /* CONFIG_SOFTWARE_SUSPEND */
 
 /* This is just a hook for the overall driver tree.
  */

Re: make idedisk_suspend()/idedisk_resume() conditional on CONFIG_SOFTWARE_SUSPEND

[Zwane Mwaikambo]

On Fri, 11 Oct 2002, William Lee Irwin III wrote:

> ide-disk.c gets the following warning:
> 
> drivers/ide/ide-disk.c:1614: warning: `idedisk_suspend' defined but not used
> drivers/ide/ide-disk.c:1651: warning: `idedisk_resume' defined but not used

Hi Pavel,
	shouldn't this kinda thing be handled by the driver model layer? 
Ditto for the device walk and suspend in suspend.c. Also what do you 
think of adding hooks to driver model tree so that we can add additional 
handlers for things like this with the driver model doing the final 
suspend as specified in the driver. 

	Zwane
-- 
function.linuxpower.ca

Re: make idedisk_suspend()/idedisk_resume() conditional on CONFIG_SOFTWARE_SUSPEND

[Pavel Machek]

Notice that Patrick broke ide on bitkeeper.... So if you wonder how it
can work in bk-current... It does not. In 2.5.41 it should be okay.

> On Fri, 11 Oct 2002, Pavel Machek wrote:
> 
> > It is handled by driver model layer, at least in 2.5.41. Do you see a
> > way how to integrate it more closely? 
> 
> Actually Pavel, what i'm boggling over is the existence of kernel/pm.c and 
> drivers/base/pm.c and its somewhat odd coexistence in the extra device 
> management code in suspend.c
> 
> 	Zwane lost-in-a-maze-of-device-management Mwaikambo
> 

-- 
Casualities in World Trade Center: ~3k dead inside the building,
cryptography in U.S.A. and free speech in Czech Republic.