| Message ID | 20230427221625.116050-4-opendmb@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | input: gpio-keys - fix pm ordering | expand |
On Thu, Apr 27, 2023 at 03:16:25PM -0700, Doug Berger wrote:
> This reverts commit 2569873096f7eb1acf63624e9772d82b23923bf4.
You have to give a reason why you are reverting it please...
thanks,
greg k-h
On Fri, Apr 28, 2023 at 6:47 AM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > On Thu, Apr 27, 2023 at 03:16:25PM -0700, Doug Berger wrote: > > This reverts commit 2569873096f7eb1acf63624e9772d82b23923bf4. > > You have to give a reason why you are reverting it please... Also, the commit ID above doesn't match any commits in the mainline.
On 4/28/2023 4:40 AM, Rafael J. Wysocki wrote: > On Fri, Apr 28, 2023 at 6:47 AM Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: >> >> On Thu, Apr 27, 2023 at 03:16:25PM -0700, Doug Berger wrote: >>> This reverts commit 2569873096f7eb1acf63624e9772d82b23923bf4. >> >> You have to give a reason why you are reverting it please... > > Also, the commit ID above doesn't match any commits in the mainline. Apologies. I attempted to explain this in the cover letter, but as anticipated it caused confusion. The relevant text was: Both commits shouldn't really exist in the same kernel so the third patch reverts the first in an attempt to make that clear (though it may be a source of confusion for some). This commit ID is the ID of the first patch of this set in my tree. It slipped my mind that of course that wouldn't be conveyed through send-mail :). D'oh! To be clear, this is really a "straw man" request for comment with hope of finding a more elegant solution to the issue. Thanks, Doug
diff --git a/drivers/base/core.c b/drivers/base/core.c index 8385df4d9677..6878dfcbf0d6 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -428,7 +428,6 @@ void device_pm_move_to_tail(struct device *dev) device_pm_unlock(); device_links_read_unlock(idx); } -EXPORT_SYMBOL_GPL(device_pm_move_to_tail); #define to_devlink(dev) container_of((dev), struct device_link, link_dev) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 7a0dcfeb02dc..e5af0a254a3f 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -810,8 +810,6 @@ static int gpio_keys_probe(struct platform_device *pdev) int i, error; int wakeup = 0; - device_pm_move_to_tail(dev); - if (!pdata) { pdata = gpio_keys_get_devtree_pdata(dev); if (IS_ERR(pdata)) diff --git a/include/linux/device.h b/include/linux/device.h index dad40bd45509..1508e637bb26 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1082,7 +1082,6 @@ void device_link_del(struct device_link *link); void device_link_remove(void *consumer, struct device *supplier); void device_links_supplier_sync_state_pause(void); void device_links_supplier_sync_state_resume(void); -void device_pm_move_to_tail(struct device *dev); extern __printf(3, 4) int dev_err_probe(const struct device *dev, int err, const char *fmt, ...);
This reverts commit 2569873096f7eb1acf63624e9772d82b23923bf4. Signed-off-by: Doug Berger <opendmb@gmail.com> --- drivers/base/core.c | 1 - drivers/input/keyboard/gpio_keys.c | 2 -- include/linux/device.h | 1 - 3 files changed, 4 deletions(-)