* [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops
@ 2011-02-16 23:58 Rafael J. Wysocki
2011-02-17 0:03 ` Greg KH
2011-02-17 0:03 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-02-16 23:58 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Alan Stern, Linux PM mailing list, LKML, linux-usb
From: Rafael J. Wysocki <rjw@sisk.pl>
USB defines usb_device_type pointing to usb_device_pm_ops that
provides system-wide PM callbacks only and usb_bus_type pointing to
usb_bus_pm_ops that provides runtime PM callbacks only. However,
the USB runtime PM callbacks may be defined in usb_device_pm_ops
which makes it possible to drop usb_bus_pm_ops and will allow us
to consolidate the handling of subsystems by the PM core code.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
Hi Greg,
Would you mind if I merged the following patch? It is requisite for
https://patchwork.kernel.org/patch/552411/ which I think is the right thing
to do and people seem to generally agree with me.
Alan has seen it and says it is fine.
Thanks,
Rafael
---
drivers/usb/core/driver.c | 15 +++------------
drivers/usb/core/usb.c | 5 +++++
drivers/usb/core/usb.h | 3 +++
3 files changed, 11 insertions(+), 12 deletions(-)
Index: linux-2.6/drivers/usb/core/driver.c
===================================================================
--- linux-2.6.orig/drivers/usb/core/driver.c
+++ linux-2.6/drivers/usb/core/driver.c
@@ -1646,7 +1646,7 @@ static int autosuspend_check(struct usb_
return 0;
}
-static int usb_runtime_suspend(struct device *dev)
+int usb_runtime_suspend(struct device *dev)
{
struct usb_device *udev = to_usb_device(dev);
int status;
@@ -1662,7 +1662,7 @@ static int usb_runtime_suspend(struct de
return status;
}
-static int usb_runtime_resume(struct device *dev)
+int usb_runtime_resume(struct device *dev)
{
struct usb_device *udev = to_usb_device(dev);
int status;
@@ -1674,7 +1674,7 @@ static int usb_runtime_resume(struct dev
return status;
}
-static int usb_runtime_idle(struct device *dev)
+int usb_runtime_idle(struct device *dev)
{
struct usb_device *udev = to_usb_device(dev);
@@ -1686,19 +1686,10 @@ static int usb_runtime_idle(struct devic
return 0;
}
-static const struct dev_pm_ops usb_bus_pm_ops = {
- .runtime_suspend = usb_runtime_suspend,
- .runtime_resume = usb_runtime_resume,
- .runtime_idle = usb_runtime_idle,
-};
-
#endif /* CONFIG_USB_SUSPEND */
struct bus_type usb_bus_type = {
.name = "usb",
.match = usb_device_match,
.uevent = usb_uevent,
-#ifdef CONFIG_USB_SUSPEND
- .pm = &usb_bus_pm_ops,
-#endif
};
Index: linux-2.6/drivers/usb/core/usb.h
===================================================================
--- linux-2.6.orig/drivers/usb/core/usb.h
+++ linux-2.6/drivers/usb/core/usb.h
@@ -77,6 +77,9 @@ static inline int usb_port_resume(struct
extern void usb_autosuspend_device(struct usb_device *udev);
extern int usb_autoresume_device(struct usb_device *udev);
extern int usb_remote_wakeup(struct usb_device *dev);
+extern int usb_runtime_suspend(struct device *dev);
+extern int usb_runtime_resume(struct device *dev);
+extern int usb_runtime_idle(struct device *dev);
#else
Index: linux-2.6/drivers/usb/core/usb.c
===================================================================
--- linux-2.6.orig/drivers/usb/core/usb.c
+++ linux-2.6/drivers/usb/core/usb.c
@@ -315,6 +315,11 @@ static const struct dev_pm_ops usb_devic
.thaw = usb_dev_thaw,
.poweroff = usb_dev_poweroff,
.restore = usb_dev_restore,
+#ifdef CONFIG_USB_SUSPEND
+ .runtime_suspend = usb_runtime_suspend,
+ .runtime_resume = usb_runtime_resume,
+ .runtime_idle = usb_runtime_idle,
+#endif
};
#endif /* CONFIG_PM */
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops
2011-02-16 23:58 [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops Rafael J. Wysocki
@ 2011-02-17 0:03 ` Greg KH
2011-02-17 0:03 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2011-02-17 0:03 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM mailing list, linux-usb, LKML
On Thu, Feb 17, 2011 at 12:58:56AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> USB defines usb_device_type pointing to usb_device_pm_ops that
> provides system-wide PM callbacks only and usb_bus_type pointing to
> usb_bus_pm_ops that provides runtime PM callbacks only. However,
> the USB runtime PM callbacks may be defined in usb_device_pm_ops
> which makes it possible to drop usb_bus_pm_ops and will allow us
> to consolidate the handling of subsystems by the PM core code.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
>
> Hi Greg,
>
> Would you mind if I merged the following patch? It is requisite for
> https://patchwork.kernel.org/patch/552411/ which I think is the right thing
> to do and people seem to generally agree with me.
>
> Alan has seen it and says it is fine.
Looks great to me, feel free to add:
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
to it and take it through your tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops
2011-02-16 23:58 [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops Rafael J. Wysocki
2011-02-17 0:03 ` Greg KH
@ 2011-02-17 0:03 ` Greg KH
2011-02-17 0:18 ` Rafael J. Wysocki
2011-02-17 0:18 ` Rafael J. Wysocki
1 sibling, 2 replies; 6+ messages in thread
From: Greg KH @ 2011-02-17 0:03 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Alan Stern, Linux PM mailing list, LKML, linux-usb
On Thu, Feb 17, 2011 at 12:58:56AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> USB defines usb_device_type pointing to usb_device_pm_ops that
> provides system-wide PM callbacks only and usb_bus_type pointing to
> usb_bus_pm_ops that provides runtime PM callbacks only. However,
> the USB runtime PM callbacks may be defined in usb_device_pm_ops
> which makes it possible to drop usb_bus_pm_ops and will allow us
> to consolidate the handling of subsystems by the PM core code.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
>
> Hi Greg,
>
> Would you mind if I merged the following patch? It is requisite for
> https://patchwork.kernel.org/patch/552411/ which I think is the right thing
> to do and people seem to generally agree with me.
>
> Alan has seen it and says it is fine.
Looks great to me, feel free to add:
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
to it and take it through your tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops
2011-02-17 0:03 ` Greg KH
@ 2011-02-17 0:18 ` Rafael J. Wysocki
2011-02-17 0:18 ` Rafael J. Wysocki
1 sibling, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-02-17 0:18 UTC (permalink / raw)
To: Greg KH; +Cc: Linux PM mailing list, linux-usb, LKML
On Thursday, February 17, 2011, Greg KH wrote:
> On Thu, Feb 17, 2011 at 12:58:56AM +0100, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> >
> > USB defines usb_device_type pointing to usb_device_pm_ops that
> > provides system-wide PM callbacks only and usb_bus_type pointing to
> > usb_bus_pm_ops that provides runtime PM callbacks only. However,
> > the USB runtime PM callbacks may be defined in usb_device_pm_ops
> > which makes it possible to drop usb_bus_pm_ops and will allow us
> > to consolidate the handling of subsystems by the PM core code.
> >
> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> > ---
> >
> > Hi Greg,
> >
> > Would you mind if I merged the following patch? It is requisite for
> > https://patchwork.kernel.org/patch/552411/ which I think is the right thing
> > to do and people seem to generally agree with me.
> >
> > Alan has seen it and says it is fine.
>
> Looks great to me, feel free to add:
> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> to it and take it through your tree.
I will, thanks!
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops
2011-02-17 0:03 ` Greg KH
2011-02-17 0:18 ` Rafael J. Wysocki
@ 2011-02-17 0:18 ` Rafael J. Wysocki
1 sibling, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-02-17 0:18 UTC (permalink / raw)
To: Greg KH; +Cc: Alan Stern, Linux PM mailing list, LKML, linux-usb
On Thursday, February 17, 2011, Greg KH wrote:
> On Thu, Feb 17, 2011 at 12:58:56AM +0100, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> >
> > USB defines usb_device_type pointing to usb_device_pm_ops that
> > provides system-wide PM callbacks only and usb_bus_type pointing to
> > usb_bus_pm_ops that provides runtime PM callbacks only. However,
> > the USB runtime PM callbacks may be defined in usb_device_pm_ops
> > which makes it possible to drop usb_bus_pm_ops and will allow us
> > to consolidate the handling of subsystems by the PM core code.
> >
> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> > ---
> >
> > Hi Greg,
> >
> > Would you mind if I merged the following patch? It is requisite for
> > https://patchwork.kernel.org/patch/552411/ which I think is the right thing
> > to do and people seem to generally agree with me.
> >
> > Alan has seen it and says it is fine.
>
> Looks great to me, feel free to add:
> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> to it and take it through your tree.
I will, thanks!
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops
@ 2011-02-16 23:58 Rafael J. Wysocki
0 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-02-16 23:58 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Linux PM mailing list, linux-usb, LKML
From: Rafael J. Wysocki <rjw@sisk.pl>
USB defines usb_device_type pointing to usb_device_pm_ops that
provides system-wide PM callbacks only and usb_bus_type pointing to
usb_bus_pm_ops that provides runtime PM callbacks only. However,
the USB runtime PM callbacks may be defined in usb_device_pm_ops
which makes it possible to drop usb_bus_pm_ops and will allow us
to consolidate the handling of subsystems by the PM core code.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
Hi Greg,
Would you mind if I merged the following patch? It is requisite for
https://patchwork.kernel.org/patch/552411/ which I think is the right thing
to do and people seem to generally agree with me.
Alan has seen it and says it is fine.
Thanks,
Rafael
---
drivers/usb/core/driver.c | 15 +++------------
drivers/usb/core/usb.c | 5 +++++
drivers/usb/core/usb.h | 3 +++
3 files changed, 11 insertions(+), 12 deletions(-)
Index: linux-2.6/drivers/usb/core/driver.c
===================================================================
--- linux-2.6.orig/drivers/usb/core/driver.c
+++ linux-2.6/drivers/usb/core/driver.c
@@ -1646,7 +1646,7 @@ static int autosuspend_check(struct usb_
return 0;
}
-static int usb_runtime_suspend(struct device *dev)
+int usb_runtime_suspend(struct device *dev)
{
struct usb_device *udev = to_usb_device(dev);
int status;
@@ -1662,7 +1662,7 @@ static int usb_runtime_suspend(struct de
return status;
}
-static int usb_runtime_resume(struct device *dev)
+int usb_runtime_resume(struct device *dev)
{
struct usb_device *udev = to_usb_device(dev);
int status;
@@ -1674,7 +1674,7 @@ static int usb_runtime_resume(struct dev
return status;
}
-static int usb_runtime_idle(struct device *dev)
+int usb_runtime_idle(struct device *dev)
{
struct usb_device *udev = to_usb_device(dev);
@@ -1686,19 +1686,10 @@ static int usb_runtime_idle(struct devic
return 0;
}
-static const struct dev_pm_ops usb_bus_pm_ops = {
- .runtime_suspend = usb_runtime_suspend,
- .runtime_resume = usb_runtime_resume,
- .runtime_idle = usb_runtime_idle,
-};
-
#endif /* CONFIG_USB_SUSPEND */
struct bus_type usb_bus_type = {
.name = "usb",
.match = usb_device_match,
.uevent = usb_uevent,
-#ifdef CONFIG_USB_SUSPEND
- .pm = &usb_bus_pm_ops,
-#endif
};
Index: linux-2.6/drivers/usb/core/usb.h
===================================================================
--- linux-2.6.orig/drivers/usb/core/usb.h
+++ linux-2.6/drivers/usb/core/usb.h
@@ -77,6 +77,9 @@ static inline int usb_port_resume(struct
extern void usb_autosuspend_device(struct usb_device *udev);
extern int usb_autoresume_device(struct usb_device *udev);
extern int usb_remote_wakeup(struct usb_device *dev);
+extern int usb_runtime_suspend(struct device *dev);
+extern int usb_runtime_resume(struct device *dev);
+extern int usb_runtime_idle(struct device *dev);
#else
Index: linux-2.6/drivers/usb/core/usb.c
===================================================================
--- linux-2.6.orig/drivers/usb/core/usb.c
+++ linux-2.6/drivers/usb/core/usb.c
@@ -315,6 +315,11 @@ static const struct dev_pm_ops usb_devic
.thaw = usb_dev_thaw,
.poweroff = usb_dev_poweroff,
.restore = usb_dev_restore,
+#ifdef CONFIG_USB_SUSPEND
+ .runtime_suspend = usb_runtime_suspend,
+ .runtime_resume = usb_runtime_resume,
+ .runtime_idle = usb_runtime_idle,
+#endif
};
#endif /* CONFIG_PM */
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-02-17 0:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-16 23:58 [PATCH] USB: Move runtime PM callbacks to usb_device_pm_ops Rafael J. Wysocki
2011-02-17 0:03 ` Greg KH
2011-02-17 0:03 ` Greg KH
2011-02-17 0:18 ` Rafael J. Wysocki
2011-02-17 0:18 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2011-02-16 23:58 Rafael J. Wysocki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.