| Message ID | 2654085.Tx1JnNWXkX@aspire.rjw.lan (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 26, 2017 at 10:47:10PM +0200, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > None of the sa1111 drivers in the tree implements the suspend and > resume callbacks from struct sa1111_driver, so drop them and drop > the corresponding callbacks from sa1111_bus_type. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> This will conflict with some patches I have - would you like me to queue it along with my changes? When would you like to get this merged?
On Tue, Sep 26, 2017 at 11:28 PM, Russell King - ARM Linux <linux@armlinux.org.uk> wrote: > On Tue, Sep 26, 2017 at 10:47:10PM +0200, Rafael J. Wysocki wrote: >> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> >> >> None of the sa1111 drivers in the tree implements the suspend and >> resume callbacks from struct sa1111_driver, so drop them and drop >> the corresponding callbacks from sa1111_bus_type. >> >> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > This will conflict with some patches I have - would you like me to queue > it along with my changes? Yes, please. > When would you like to get this merged? When possible. :-) I would like to drop the legacy suspend/resume callbacks from struct bus_type eventually, as that's long overdue, and this is needed for that purpose. Not too urgent, though. Thanks, Rafael
On Tue, Sep 26, 2017 at 11:37:40PM +0200, Rafael J. Wysocki wrote: > On Tue, Sep 26, 2017 at 11:28 PM, Russell King - ARM Linux > <linux@armlinux.org.uk> wrote: > > On Tue, Sep 26, 2017 at 10:47:10PM +0200, Rafael J. Wysocki wrote: > >> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > >> > >> None of the sa1111 drivers in the tree implements the suspend and > >> resume callbacks from struct sa1111_driver, so drop them and drop > >> the corresponding callbacks from sa1111_bus_type. > >> > >> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > This will conflict with some patches I have - would you like me to queue > > it along with my changes? > > Yes, please. > > > When would you like to get this merged? > > When possible. :-) > > I would like to drop the legacy suspend/resume callbacks from struct > bus_type eventually, as that's long overdue, and this is needed for > that purpose. Not too urgent, though. Sorry, I'd forgotten that I already had a similar patch: http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?h=sa1100&id=0e4ec3edb1c7e44aba1f48b924ab0c77431fd155 so no need to merge your veresion... I just need to get my version merged.
On Thu, Sep 28, 2017 at 11:49 AM, Russell King - ARM Linux <linux@armlinux.org.uk> wrote: > On Tue, Sep 26, 2017 at 11:37:40PM +0200, Rafael J. Wysocki wrote: >> On Tue, Sep 26, 2017 at 11:28 PM, Russell King - ARM Linux >> <linux@armlinux.org.uk> wrote: >> > On Tue, Sep 26, 2017 at 10:47:10PM +0200, Rafael J. Wysocki wrote: >> >> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> >> >> >> >> None of the sa1111 drivers in the tree implements the suspend and >> >> resume callbacks from struct sa1111_driver, so drop them and drop >> >> the corresponding callbacks from sa1111_bus_type. >> >> >> >> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> >> > >> > This will conflict with some patches I have - would you like me to queue >> > it along with my changes? >> >> Yes, please. >> >> > When would you like to get this merged? >> >> When possible. :-) >> >> I would like to drop the legacy suspend/resume callbacks from struct >> bus_type eventually, as that's long overdue, and this is needed for >> that purpose. Not too urgent, though. > > Sorry, I'd forgotten that I already had a similar patch: > > http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?h=sa1100&id=0e4ec3edb1c7e44aba1f48b924ab0c77431fd155 > > so no need to merge your veresion... I just need to get my version merged. OK What about the locomo one? Thanks, Rafael
On Thu, Sep 28, 2017 at 09:09:42PM +0200, Rafael J. Wysocki wrote: > On Thu, Sep 28, 2017 at 11:49 AM, Russell King - ARM Linux > <linux@armlinux.org.uk> wrote: > > On Tue, Sep 26, 2017 at 11:37:40PM +0200, Rafael J. Wysocki wrote: > >> On Tue, Sep 26, 2017 at 11:28 PM, Russell King - ARM Linux > >> <linux@armlinux.org.uk> wrote: > >> > On Tue, Sep 26, 2017 at 10:47:10PM +0200, Rafael J. Wysocki wrote: > >> >> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > >> >> > >> >> None of the sa1111 drivers in the tree implements the suspend and > >> >> resume callbacks from struct sa1111_driver, so drop them and drop > >> >> the corresponding callbacks from sa1111_bus_type. > >> >> > >> >> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > >> > > >> > This will conflict with some patches I have - would you like me to queue > >> > it along with my changes? > >> > >> Yes, please. > >> > >> > When would you like to get this merged? > >> > >> When possible. :-) > >> > >> I would like to drop the legacy suspend/resume callbacks from struct > >> bus_type eventually, as that's long overdue, and this is needed for > >> that purpose. Not too urgent, though. > > > > Sorry, I'd forgotten that I already had a similar patch: > > > > http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?h=sa1100&id=0e4ec3edb1c7e44aba1f48b924ab0c77431fd155 > > > > so no need to merge your veresion... I just need to get my version merged. > > OK As other maintainers have taken patches from my series, I can no longer merge your patch this cycle, (due to the dependencies involving multiple trees.) I'll postpone the change until after the next merge window. I can't really say about Locomo, having never really been involved with that stuff.
On Saturday, October 14, 2017 4:43:51 PM CEST Russell King - ARM Linux wrote: > On Thu, Sep 28, 2017 at 09:09:42PM +0200, Rafael J. Wysocki wrote: > > On Thu, Sep 28, 2017 at 11:49 AM, Russell King - ARM Linux > > <linux@armlinux.org.uk> wrote: > > > On Tue, Sep 26, 2017 at 11:37:40PM +0200, Rafael J. Wysocki wrote: > > >> On Tue, Sep 26, 2017 at 11:28 PM, Russell King - ARM Linux > > >> <linux@armlinux.org.uk> wrote: > > >> > On Tue, Sep 26, 2017 at 10:47:10PM +0200, Rafael J. Wysocki wrote: > > >> >> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > >> >> > > >> >> None of the sa1111 drivers in the tree implements the suspend and > > >> >> resume callbacks from struct sa1111_driver, so drop them and drop > > >> >> the corresponding callbacks from sa1111_bus_type. > > >> >> > > >> >> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > >> > > > >> > This will conflict with some patches I have - would you like me to queue > > >> > it along with my changes? > > >> > > >> Yes, please. > > >> > > >> > When would you like to get this merged? > > >> > > >> When possible. :-) > > >> > > >> I would like to drop the legacy suspend/resume callbacks from struct > > >> bus_type eventually, as that's long overdue, and this is needed for > > >> that purpose. Not too urgent, though. > > > > > > Sorry, I'd forgotten that I already had a similar patch: > > > > > > http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?h=sa1100&id=0e4ec3edb1c7e44aba1f48b924ab0c77431fd155 > > > > > > so no need to merge your veresion... I just need to get my version merged. > > > > OK > > As other maintainers have taken patches from my series, I can no longer > merge your patch this cycle, (due to the dependencies involving multiple > trees.) I'll postpone the change until after the next merge window. That's OK, thanks. > I can't really say about Locomo, having never really been involved with > that stuff. Well, so far no on has been complaining about that patch. :-) Thanks, Rafael
Index: linux-pm/arch/arm/include/asm/hardware/sa1111.h =================================================================== --- linux-pm.orig/arch/arm/include/asm/hardware/sa1111.h +++ linux-pm/arch/arm/include/asm/hardware/sa1111.h @@ -430,8 +430,6 @@ struct sa1111_driver { unsigned int devid; int (*probe)(struct sa1111_dev *); int (*remove)(struct sa1111_dev *); - int (*suspend)(struct sa1111_dev *, pm_message_t); - int (*resume)(struct sa1111_dev *); void (*shutdown)(struct sa1111_dev *); }; Index: linux-pm/arch/arm/common/sa1111.c =================================================================== --- linux-pm.orig/arch/arm/common/sa1111.c +++ linux-pm/arch/arm/common/sa1111.c @@ -1379,28 +1379,6 @@ static int sa1111_match(struct device *_ return !!(dev->devid & drv->devid); } -static int sa1111_bus_suspend(struct device *dev, pm_message_t state) -{ - struct sa1111_dev *sadev = to_sa1111_device(dev); - struct sa1111_driver *drv = SA1111_DRV(dev->driver); - int ret = 0; - - if (drv && drv->suspend) - ret = drv->suspend(sadev, state); - return ret; -} - -static int sa1111_bus_resume(struct device *dev) -{ - struct sa1111_dev *sadev = to_sa1111_device(dev); - struct sa1111_driver *drv = SA1111_DRV(dev->driver); - int ret = 0; - - if (drv && drv->resume) - ret = drv->resume(sadev); - return ret; -} - static void sa1111_bus_shutdown(struct device *dev) { struct sa1111_driver *drv = SA1111_DRV(dev->driver); @@ -1436,8 +1414,6 @@ struct bus_type sa1111_bus_type = { .match = sa1111_match, .probe = sa1111_bus_probe, .remove = sa1111_bus_remove, - .suspend = sa1111_bus_suspend, - .resume = sa1111_bus_resume, .shutdown = sa1111_bus_shutdown, }; EXPORT_SYMBOL(sa1111_bus_type);