pm: remove bus_type suspend_late()/resume_early() V2
Subsystems (4)
PATCH 1/1 pm: remove bus_type suspend_late()/resume_early() V2
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct bus_type V2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should use dev_pm_ops.
---
Changes since V1:
- Documentation/power/devices.txt changes
Documentation/power/devices.txt | 34 +++++----------------------------- drivers/base/power/main.c | 7 ------- include/linux/device.h | 2 -- 3 files changed, 5 insertions(+), 38 deletions(-)
Documentation/power/devices.txt +5 -29
@@ -75,9 +75,6 @@ may need to apply in domain-specific way struct bus_type { ... int (*suspend)(struct device *dev, pm_message_t state); - int (*suspend_late)(struct device *dev, pm_message_t state); - - int (*resume_early)(struct device *dev); int (*resume)(struct device *dev); };
@@ -226,20 +223,7 @@ The phases are seen by driver notificati This call should handle parts of device suspend logic that require sleeping. It probably does work to quiesce the device which hasn't - been abstracted into class.suspend() or bus.suspend_late(). - - 3 bus.suspend_late(dev, message) is called with IRQs disabled, and - with only one CPU active. Until the bus.resume_early() phase - completes (see later), IRQs are not enabled again. This method - won't be exposed by all busses; for message based busses like USB, - I2C, or SPI, device interactions normally require IRQs. This bus - call may be morphed into a driver call with bus-specific parameters. - - This call might save low level hardware state that might otherwise - be lost in the upcoming low power state, and actually put the - device into a low power state ... so that in some cases the device - may stay partly usable until this late. This "late" call may also - help when coping with hardware that behaves badly. + been abstracted into class.suspend(). The pm_message_t parameter is currently used to refine those semantics (described later).
@@ -351,19 +335,11 @@ devices processing each phase's calls be The phases are seen by driver notifications issued in this order: - 1 bus.resume_early(dev) is called with IRQs disabled, and with - only one CPU active. As with bus.suspend_late(), this method - won't be supported on busses that require IRQs in order to - interact with devices. - - This reverses the effects of bus.suspend_late(). - - 2 bus.resume(dev) is called next. This may be morphed into a device - driver call with bus-specific parameters; implementations may sleep. - - This reverses the effects of bus.suspend(). + 1 bus.resume(dev) reverses the effects of bus.suspend(). This may + be morphed into a device driver call with bus-specific parameters; + implementations may sleep. - 3 class.resume(dev) is called for devices associated with a class + 2 class.resume(dev) is called for devices associated with a class that has such a method. Implementations may sleep. This reverses the effects of class.suspend(), and would usually
drivers/base/power/main.c +0 -7
@@ -334,9 +334,6 @@ static int __device_resume_noirq(structif (dev->bus->pm) {pm_dev_dbg (dev, state,"EARLY " ); error =pm_noirq_op (dev, dev->bus->pm, state); - }else if (dev->bus->resume_early) { -pm_dev_dbg (dev, state,"legacy EARLY " ); - error = dev->bus->resume_early (dev); } End:TRACE_RESUME (error);
@@ -591,10 +588,6 @@ static int __device_suspend_noirq(structif (dev->bus->pm) {pm_dev_dbg (dev, state,"LATE " ); error =pm_noirq_op (dev, dev->bus->pm, state); - }else if (dev->bus->suspend_late) { -pm_dev_dbg (dev, state,"legacy LATE " ); - error = dev->bus->suspend_late (dev, state); -suspend_report_result (dev->bus->suspend_late, error); }return error; }
include/linux/device.h +0 -2
@@ -62,8 +62,6 @@ struct bus_type {void (*shutdown)(struct device *dev);int (*suspend)(struct device *dev,pm_message_t state); -int (*suspend_late)(struct device *dev,pm_message_t state); -int (*resume_early)(struct device *dev);int (*resume)(struct device *dev);struct dev_pm_ops *pm;
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.
I'd like to apply this patch as is.
Greg, is it fine with you?
Best,
Rafael
Quoted 103 lines
Signed-off-by Magnus Damm <[email protected]>---
Changes since V1:
-Documentation/power/devices.txtchangesDocumentation/power/devices.txt | 34 +++++----------------------------- drivers/base/power/main.c | 7 ------- include/linux/device.h | 2 -- 3 files changed, 5 insertions(+), 38 deletions(-)Documentation/power/devices.txt +5
-29@@ -75,9 +75,6 @@ may need to apply in domain-specific way struct bus_type { int (*suspend)(struct device *dev, pm_message_t state); - int (*suspend_late)(struct device *dev, pm_message_t state); - - int (*resume_early)(struct device *dev); int (*resume)(struct device *dev); };@@ -226,20 +223,7 @@ The phases are seen by driver notificati This call should handle parts of device suspend logic that require sleeping. It probably does work to quiesce the device which hasn't - been abstracted into class.suspend() or bus.suspend_late(). - - 3 bus.suspend_late(dev, message) is called with IRQs disabled, and - with only one CPU active. Until the bus.resume_early() phase - completes (see later), IRQs are not enabled again. This method - won't be exposed by all busses; for message based busses like USB, - I2C, or SPI, device interactions normally require IRQs. This bus - call may be morphed into a driver call with bus-specific parameters. - - This call might save low level hardware state that might otherwise - be lost in the upcoming low power state, and actually put the - device into a low power state ... so that in some cases the device - may stay partly usable until this late. This "late" call may also - help when coping with hardware that behaves badly. + been abstracted into class.suspend(). The pm_message_t parameter is currently used to refine those semantics (described later).@@ -351,19 +335,11 @@ devices processing each phase's calls be The phases are seen by driver notifications issued in this order: - 1 bus.resume_early(dev) is called with IRQs disabled, and with - only one CPU active. As with bus.suspend_late(), this method - won't be supported on busses that require IRQs in order to - interact with devices. - - This reverses the effects of bus.suspend_late(). - - 2 bus.resume(dev) is called next. This may be morphed into a device - driver call with bus-specific parameters; implementations may sleep. - - This reverses the effects of bus.suspend(). + 1 bus.resume(dev) reverses the effects of bus.suspend(). This may + be morphed into a device driver call with bus-specific parameters; + implementations may sleep. - 3 class.resume(dev) is called for devices associated with a class + 2 class.resume(dev) is called for devices associated with a class that has such a method. Implementations may sleep. This reverses the effects of class.suspend(), and would usuallydrivers/base/power/main.c +0
-7@@ -334,9 +334,6 @@ static int __device_resume_noirq(structif (dev->bus->pm) {pm_dev_dbg (dev, state,"EARLY " ); error =pm_noirq_op (dev, dev->bus->pm, state); - }else if (dev->bus->resume_early) { -pm_dev_dbg (dev, state,"legacy EARLY " ); - error = dev->bus->resume_early (dev); } End:TRACE_RESUME (error);@@ -591,10 +588,6 @@ static int __device_suspend_noirq(structif (dev->bus->pm) {pm_dev_dbg (dev, state,"LATE " ); error =pm_noirq_op (dev, dev->bus->pm, state); - }else if (dev->bus->suspend_late) { -pm_dev_dbg (dev, state,"legacy LATE " ); - error = dev->bus->suspend_late (dev, state); -suspend_report_result (dev->bus->suspend_late, error); }return error; }include/linux/device.h +0
-2@@ -62,8 +62,6 @@ struct bus_type {void (*shutdown)(struct device *dev);int (*suspend)(struct device *dev,pm_message_t state); -int (*suspend_late)(struct device *dev,pm_message_t state); -int (*resume_early)(struct device *dev);int (*resume)(struct device *dev);struct dev_pm_ops *pm;
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.
I'd like to apply this patch as is.
Greg, is it fine with you?
Best,
Rafael
Quoted 103 lines
Signed-off-by Magnus Damm <[email protected]>---
Changes since V1:
-Documentation/power/devices.txtchangesDocumentation/power/devices.txt | 34 +++++----------------------------- drivers/base/power/main.c | 7 ------- include/linux/device.h | 2 -- 3 files changed, 5 insertions(+), 38 deletions(-)Documentation/power/devices.txt +5
-29@@ -75,9 +75,6 @@ may need to apply in domain-specific way struct bus_type { int (*suspend)(struct device *dev, pm_message_t state); - int (*suspend_late)(struct device *dev, pm_message_t state); - - int (*resume_early)(struct device *dev); int (*resume)(struct device *dev); };@@ -226,20 +223,7 @@ The phases are seen by driver notificati This call should handle parts of device suspend logic that require sleeping. It probably does work to quiesce the device which hasn't - been abstracted into class.suspend() or bus.suspend_late(). - - 3 bus.suspend_late(dev, message) is called with IRQs disabled, and - with only one CPU active. Until the bus.resume_early() phase - completes (see later), IRQs are not enabled again. This method - won't be exposed by all busses; for message based busses like USB, - I2C, or SPI, device interactions normally require IRQs. This bus - call may be morphed into a driver call with bus-specific parameters. - - This call might save low level hardware state that might otherwise - be lost in the upcoming low power state, and actually put the - device into a low power state ... so that in some cases the device - may stay partly usable until this late. This "late" call may also - help when coping with hardware that behaves badly. + been abstracted into class.suspend(). The pm_message_t parameter is currently used to refine those semantics (described later).@@ -351,19 +335,11 @@ devices processing each phase's calls be The phases are seen by driver notifications issued in this order: - 1 bus.resume_early(dev) is called with IRQs disabled, and with - only one CPU active. As with bus.suspend_late(), this method - won't be supported on busses that require IRQs in order to - interact with devices. - - This reverses the effects of bus.suspend_late(). - - 2 bus.resume(dev) is called next. This may be morphed into a device - driver call with bus-specific parameters; implementations may sleep. - - This reverses the effects of bus.suspend(). + 1 bus.resume(dev) reverses the effects of bus.suspend(). This may + be morphed into a device driver call with bus-specific parameters; + implementations may sleep. - 3 class.resume(dev) is called for devices associated with a class + 2 class.resume(dev) is called for devices associated with a class that has such a method. Implementations may sleep. This reverses the effects of class.suspend(), and would usuallydrivers/base/power/main.c +0
-7@@ -334,9 +334,6 @@ static int __device_resume_noirq(structif (dev->bus->pm) {pm_dev_dbg (dev, state,"EARLY " ); error =pm_noirq_op (dev, dev->bus->pm, state); - }else if (dev->bus->resume_early) { -pm_dev_dbg (dev, state,"legacy EARLY " ); - error = dev->bus->resume_early (dev); } End:TRACE_RESUME (error);@@ -591,10 +588,6 @@ static int __device_suspend_noirq(structif (dev->bus->pm) {pm_dev_dbg (dev, state,"LATE " ); error =pm_noirq_op (dev, dev->bus->pm, state); - }else if (dev->bus->suspend_late) { -pm_dev_dbg (dev, state,"legacy LATE " ); - error = dev->bus->suspend_late (dev, state); -suspend_report_result (dev->bus->suspend_late, error); }return error; }include/linux/device.h +0
-2@@ -62,8 +62,6 @@ struct bus_type {void (*shutdown)(struct device *dev);int (*suspend)(struct device *dev,pm_message_t state); -int (*suspend_late)(struct device *dev,pm_message_t state); -int (*resume_early)(struct device *dev);int (*resume)(struct device *dev);struct dev_pm_ops *pm;
Greg KH
Acked-byQuoted 11 lines · Rafael J. Wysocki
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.I'd like to apply this patch as is.
Greg, is it fine with you?
Yes, please feel free to apply this to your tree:
or do you want me to take it in mine? If so, no problem, just let me know, and resend it.
thanks,
greg k-h
Greg KH
Acked-byQuoted 11 lines · Rafael J. Wysocki
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.I'd like to apply this patch as is.
Greg, is it fine with you?
Yes, please feel free to apply this to your tree:
or do you want me to take it in mine? If so, no problem, just let me know, and resend it.
thanks,
greg k-h
Quoted 11 lines · Greg KH
Quoted 10 lines · Rafael J. Wysocki
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.I'd like to apply this patch as is.
Quoted 7 lines
Quoted 1 line
Greg, is it fine with you?
Yes, please feel free to apply this to your tree:
or do you want me to take it in mine? If so, no problem, just let me know, and resend it.
I'll handle it, thanks!
Best,
Rafael
Quoted 11 lines · Greg KH
Quoted 10 lines · Rafael J. Wysocki
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.I'd like to apply this patch as is.
Quoted 7 lines
Quoted 1 line
Greg, is it fine with you?
Yes, please feel free to apply this to your tree:
or do you want me to take it in mine? If so, no problem, just let me know, and resend it.
I'll handle it, thanks!
Best,
Rafael
Quoted 14 lines · Rafael J. Wysocki
Quoted 13 lines · Greg KH
Quoted 11 lines · Rafael J. Wysocki
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.I'd like to apply this patch as is.
Greg, is it fine with you?
Quoted 7 lines
Quoted 5 lines
Yes, please feel free to apply this to your tree:
or do you want me to take it in mine? If so, no problem, just let me know, and resend it.
I'll handle it, thanks!
Patch applied to the suspend-2.6 tree (linux-next branch).
Thanks,
Rafael
Quoted 14 lines · Rafael J. Wysocki
Quoted 13 lines · Greg KH
Quoted 11 lines · Rafael J. Wysocki
Quoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.I'd like to apply this patch as is.
Greg, is it fine with you?
Quoted 7 lines
Quoted 5 lines
Yes, please feel free to apply this to your tree:
or do you want me to take it in mine? If so, no problem, just let me know, and resend it.
I'll handle it, thanks!
Patch applied to the suspend-2.6 tree (linux-next branch).
Thanks,
Rafael
Quoted 8 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Remove the ->suspend_late() and ->resume_early() callbacks from struct
bus_typeV2. These callbacks are legacy stuff at this point and since there seem to be no in-tree users we may as well remove them. New users should usedev_pm_ops.Signed-off-by Magnus Damm <[email protected]>
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html