From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Cc: linux-input@vger.kernel.org, linux-acpi@vger.kernel.org,
Len Brown <lenb@kernel.org>,
kernel@collabora.com
Subject: Re: [PATCHv2 3/7] ACPI: button: Use input_device_enabled() helper
Date: Mon, 18 May 2020 14:40:45 +0200 [thread overview]
Message-ID: <1834268.b3YDLlcz4u@kreacher> (raw)
In-Reply-To: <20200515165327.29212-1-andrzej.p@collabora.com>
On Friday, May 15, 2020 6:53:27 PM CEST Andrzej Pietrasiewicz wrote:
> A new helper is available, so use it. Inspecting input device's 'users'
> member should be done under device's mutex, so add appropriate invocations.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
> ---
> drivers/acpi/button.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
> index 78cfc70cb320..7e081bae48ab 100644
> --- a/drivers/acpi/button.c
> +++ b/drivers/acpi/button.c
> @@ -411,7 +411,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
> input = button->input;
> if (button->type == ACPI_BUTTON_TYPE_LID) {
> mutex_lock(&button->input->mutex);
> - users = button->input->users;
> + users = input_device_enabled(button->input);
> mutex_unlock(&button->input->mutex);
> if (users)
> acpi_lid_update_state(device, true);
> @@ -456,13 +456,17 @@ static int acpi_button_resume(struct device *dev)
> {
> struct acpi_device *device = to_acpi_device(dev);
> struct acpi_button *button = acpi_driver_data(device);
> + struct input_dev *input = button->input;
>
> button->suspended = false;
> - if (button->type == ACPI_BUTTON_TYPE_LID && button->input->users) {
> + mutex_lock(&input->mutex);
> + if (button->type == ACPI_BUTTON_TYPE_LID &&
> + input_device_enabled(input)) {
> button->last_state = !!acpi_lid_evaluate_state(device);
> button->last_time = ktime_get();
> acpi_lid_initialize_state(device);
> }
> + mutex_unlock(&input->mutex);
> return 0;
> }
> #endif
>
This appears to conflate a fix (the introduction of the missing mutex locking)
with adding new functionality through input_device_enabled().
Please do the fix separately in advance so it can be backported.
Thanks!
next prev parent reply other threads:[~2020-05-18 12:40 UTC|newest]
Thread overview: 264+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 16:16 [PATCH 0/2] Support inhibiting input devices Andrzej Pietrasiewicz
2020-04-30 16:16 ` [PATCH 1/2] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-05-06 0:27 ` Dmitry Torokhov
2020-05-15 16:49 ` [PATCHv2 0/7] Support inhibiting input devices Andrzej Pietrasiewicz
2020-05-15 16:49 ` Andrzej Pietrasiewicz
2020-05-15 16:49 ` Andrzej Pietrasiewicz
2020-05-15 16:52 ` [PATCHv2 4/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:52 ` Andrzej Pietrasiewicz
2020-05-15 16:52 ` [PATCHv2 5/7] platform/x86: thinkpad_acpi: " Andrzej Pietrasiewicz
2020-05-15 17:02 ` Henrique de Moraes Holschuh
[not found] ` <20200515164943.28480-1-andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-05-15 16:51 ` [PATCHv2 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:51 ` Andrzej Pietrasiewicz
2020-05-15 16:51 ` Andrzej Pietrasiewicz
2020-05-15 16:51 ` [PATCHv2 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:51 ` Andrzej Pietrasiewicz
2020-05-15 16:51 ` Andrzej Pietrasiewicz
2020-05-15 16:52 ` [PATCHv2 6/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-05-15 16:52 ` Andrzej Pietrasiewicz
2020-05-15 16:52 ` Andrzej Pietrasiewicz
2020-05-15 18:19 ` [PATCHv2 0/7] Support inhibiting input devices Hans de Goede
2020-05-15 18:19 ` Hans de Goede
2020-05-15 18:19 ` Hans de Goede
[not found] ` <842b95bb-8391-5806-fe65-be64b02de122-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2020-05-17 22:55 ` Peter Hutterer
2020-05-17 22:55 ` Peter Hutterer
2020-05-17 22:55 ` Peter Hutterer
2020-05-18 2:40 ` Dmitry Torokhov
2020-05-18 2:40 ` Dmitry Torokhov
2020-05-18 2:40 ` Dmitry Torokhov
2020-05-18 7:36 ` Hans de Goede
2020-05-18 7:36 ` Hans de Goede
2020-05-18 7:36 ` Hans de Goede
2020-05-22 15:35 ` Andrzej Pietrasiewicz
2020-05-22 15:35 ` Andrzej Pietrasiewicz
2020-05-22 15:35 ` Andrzej Pietrasiewicz
2020-05-27 6:13 ` Peter Hutterer
2020-05-27 6:13 ` Peter Hutterer
2020-05-27 6:13 ` Peter Hutterer
2020-05-18 10:48 ` Andrzej Pietrasiewicz
2020-05-18 10:48 ` Andrzej Pietrasiewicz
2020-05-18 10:48 ` Andrzej Pietrasiewicz
[not found] ` <e6030957-97dc-5b04-7855-bc14a78164c8-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-05-18 12:24 ` Hans de Goede
2020-05-18 12:24 ` Hans de Goede
2020-05-18 12:24 ` Hans de Goede
2020-05-18 13:49 ` Andrzej Pietrasiewicz
2020-05-18 13:49 ` Andrzej Pietrasiewicz
2020-05-18 13:49 ` Andrzej Pietrasiewicz
2020-05-18 14:23 ` Hans de Goede
2020-05-18 14:23 ` Hans de Goede
2020-05-18 14:23 ` Hans de Goede
2020-05-19 9:02 ` Andrzej Pietrasiewicz
2020-05-19 9:02 ` Andrzej Pietrasiewicz
2020-05-19 9:02 ` Andrzej Pietrasiewicz
2020-05-19 9:36 ` Hans de Goede
2020-05-19 9:36 ` Hans de Goede
2020-05-19 9:36 ` Hans de Goede
[not found] ` <aa2ce2ab-e5bc-9cb4-8b53-c1ef9348b646-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2020-05-27 6:34 ` Dmitry Torokhov
2020-05-27 6:34 ` Dmitry Torokhov
2020-05-27 6:34 ` Dmitry Torokhov
2020-06-02 16:56 ` Andrzej Pietrasiewicz
2020-06-02 16:56 ` Andrzej Pietrasiewicz
2020-06-02 16:56 ` Andrzej Pietrasiewicz
2020-06-02 17:52 ` Dmitry Torokhov
2020-06-02 17:52 ` Dmitry Torokhov
2020-06-02 17:52 ` Dmitry Torokhov
2020-06-02 18:50 ` Andrzej Pietrasiewicz
2020-06-02 18:50 ` Andrzej Pietrasiewicz
2020-06-02 18:50 ` Andrzej Pietrasiewicz
2020-06-02 20:19 ` Hans de Goede
2020-06-02 20:19 ` Hans de Goede
2020-06-02 20:19 ` Hans de Goede
[not found] ` <8f97d2e1-497a-495d-bc82-f46dbeba440c-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2020-06-03 13:07 ` Andrzej Pietrasiewicz
2020-06-03 13:07 ` Andrzej Pietrasiewicz
2020-06-03 13:07 ` Andrzej Pietrasiewicz
2020-06-03 17:38 ` Hans de Goede
2020-06-03 17:38 ` Hans de Goede
2020-06-03 17:38 ` Hans de Goede
2020-06-03 17:54 ` Andrzej Pietrasiewicz
2020-06-03 17:54 ` Andrzej Pietrasiewicz
2020-06-03 17:54 ` Andrzej Pietrasiewicz
2020-06-03 19:37 ` Hans de Goede
2020-06-03 19:37 ` Hans de Goede
2020-06-03 19:37 ` Hans de Goede
2020-06-04 7:28 ` Dmitry Torokhov
2020-06-04 7:28 ` Dmitry Torokhov
2020-06-04 7:28 ` Dmitry Torokhov
2020-06-05 17:33 ` [PATCH v3 " Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 3/7] ACPI: button: Access input device's users under appropriate mutex Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 5/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
[not found] ` <20200605173335.13753-6-andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-06-05 19:49 ` Michał Mirosław
2020-06-05 19:49 ` Michał Mirosław
2020-06-05 19:49 ` Michał Mirosław
[not found] ` <20200605173335.13753-1-andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-06-05 17:33 ` [PATCH v3 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 4/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 6/7] platform/x86: thinkpad_acpi: Use input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-07 20:24 ` [PATCH v3 0/7] Support inhibiting input devices Pavel Machek
2020-06-07 20:24 ` Pavel Machek
2020-06-07 20:24 ` Pavel Machek
2020-06-08 5:37 ` Dmitry Torokhov
2020-06-08 5:37 ` Dmitry Torokhov
2020-06-08 5:37 ` Dmitry Torokhov
2020-06-08 9:28 ` Andrzej Pietrasiewicz
2020-06-08 9:28 ` Andrzej Pietrasiewicz
2020-06-08 9:28 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 7/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:33 ` Andrzej Pietrasiewicz
2020-06-05 17:41 ` Hans de Goede
2020-06-05 17:41 ` Hans de Goede
2020-06-05 17:41 ` Hans de Goede
[not found] ` <2336e15d-ff4b-bbb6-c701-dbf3aa110fcd-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2020-06-08 11:22 ` [PATCH v4 0/7] Support inhibiting input devices Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` [PATCH v4 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-12-03 6:25 ` Dmitry Torokhov
2020-12-03 6:25 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-12-03 6:26 ` Dmitry Torokhov
2020-12-03 6:26 ` Dmitry Torokhov
[not found] ` <CGME20201207133237eucas1p26f8484944760a14e51dc7353ed33cd28@eucas1p2.samsung.com>
2020-12-07 13:32 ` Marek Szyprowski
2020-12-07 13:32 ` Marek Szyprowski
2020-12-07 15:50 ` Andrzej Pietrasiewicz
2020-12-07 15:50 ` Andrzej Pietrasiewicz
2020-12-08 10:05 ` Marek Szyprowski
2020-12-08 10:05 ` Marek Szyprowski
2020-12-09 6:37 ` Dmitry Torokhov
2020-12-09 6:37 ` Dmitry Torokhov
2020-12-11 7:09 ` [PATCH] Input: cyapa - do not call input_device_enabled from power mode handler Dmitry Torokhov
2020-12-11 7:09 ` Dmitry Torokhov
2020-12-11 8:22 ` Marek Szyprowski
2020-12-11 8:22 ` Marek Szyprowski
2020-12-11 8:31 ` Dmitry Torokhov
2020-12-11 8:31 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 3/7] ACPI: button: Access input device's users under appropriate mutex Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-24 15:00 ` Rafael J. Wysocki
2020-06-24 15:00 ` Rafael J. Wysocki
2020-06-24 15:00 ` Rafael J. Wysocki
2020-06-25 5:23 ` Dmitry Torokhov
2020-06-25 5:23 ` Dmitry Torokhov
2020-06-25 5:23 ` Dmitry Torokhov
2020-06-25 10:55 ` Rafael J. Wysocki
2020-06-25 10:55 ` Rafael J. Wysocki
2020-06-25 10:55 ` Rafael J. Wysocki
2020-10-05 5:08 ` Dmitry Torokhov
2020-10-05 5:08 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 4/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-25 5:24 ` Dmitry Torokhov
2020-06-25 5:24 ` Dmitry Torokhov
2020-06-25 5:24 ` Dmitry Torokhov
2020-10-05 5:06 ` Dmitry Torokhov
2020-10-05 5:06 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 5/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
[not found] ` <20200608112211.12125-6-andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-06-10 1:28 ` Michał Mirosław
2020-06-10 1:28 ` Michał Mirosław
2020-06-10 1:28 ` Michał Mirosław
2020-06-10 7:52 ` [FIXED PATCH " Andrzej Pietrasiewicz
2020-06-10 7:52 ` Andrzej Pietrasiewicz
2020-06-10 7:52 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` [PATCH v4 6/7] platform/x86: thinkpad_acpi: " Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` [PATCH v4 7/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-06-08 11:22 ` Andrzej Pietrasiewicz
2020-10-05 18:10 ` Dmitry Torokhov
2020-10-05 18:10 ` Dmitry Torokhov
2020-10-06 13:04 ` Andrzej Pietrasiewicz
2020-10-06 13:04 ` Andrzej Pietrasiewicz
2020-10-07 1:11 ` Dmitry Torokhov
2020-10-07 1:11 ` Dmitry Torokhov
2020-10-07 1:12 ` Dmitry Torokhov
2020-10-07 1:12 ` Dmitry Torokhov
2020-12-03 6:26 ` Dmitry Torokhov
2020-12-03 6:26 ` Dmitry Torokhov
[not found] ` <20200608112211.12125-1-andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-06-10 9:49 ` [PATCH v4 0/7] Support inhibiting input devices Hans de Goede
2020-06-10 9:49 ` Hans de Goede
2020-06-10 9:49 ` Hans de Goede
2020-06-10 10:38 ` Rafael J. Wysocki
2020-06-10 10:38 ` Rafael J. Wysocki
2020-06-10 10:38 ` Rafael J. Wysocki
[not found] ` <CAJZ5v0hB2ra2K=dd9ZjVyy1V2b1PmFHm79uDO2HtHU1D_4YUbw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-06-10 13:12 ` Andrzej Pietrasiewicz
2020-06-10 13:12 ` Andrzej Pietrasiewicz
2020-06-10 13:12 ` Andrzej Pietrasiewicz
2020-06-10 13:21 ` Hans de Goede
2020-06-10 13:21 ` Hans de Goede
2020-06-10 13:21 ` Hans de Goede
2020-06-10 13:41 ` Andrzej Pietrasiewicz
2020-06-10 13:41 ` Andrzej Pietrasiewicz
2020-06-10 13:41 ` Andrzej Pietrasiewicz
[not found] ` <2d5fd063-66bc-c707-4041-84a17c0a7d04-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-06-12 8:30 ` Hans de Goede
2020-06-12 8:30 ` Hans de Goede
2020-06-12 8:30 ` Hans de Goede
2020-06-12 8:47 ` Andrzej Pietrasiewicz
2020-06-12 8:47 ` Andrzej Pietrasiewicz
2020-06-12 8:47 ` Andrzej Pietrasiewicz
2020-06-16 17:29 ` [PATCH] Input: document inhibiting Andrzej Pietrasiewicz
2020-06-16 17:29 ` Andrzej Pietrasiewicz
2020-06-16 17:29 ` Andrzej Pietrasiewicz
2020-06-16 17:38 ` Randy Dunlap
2020-06-16 17:38 ` Randy Dunlap
2020-06-16 17:38 ` Randy Dunlap
[not found] ` <20200616172909.21625-1-andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-06-17 7:44 ` Hans de Goede
2020-06-17 7:44 ` Hans de Goede
2020-06-17 7:44 ` Hans de Goede
[not found] ` <f9007f37-c526-5fa4-3188-a554d2434177-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2020-06-17 10:18 ` [PATCH v2] " Andrzej Pietrasiewicz
2020-06-17 10:18 ` Andrzej Pietrasiewicz
2020-06-17 10:18 ` Andrzej Pietrasiewicz
[not found] ` <20200617101822.8558-1-andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2020-06-17 10:21 ` Hans de Goede
2020-06-17 10:21 ` Hans de Goede
2020-06-17 10:21 ` Hans de Goede
2020-06-17 16:52 ` Randy Dunlap
2020-06-17 16:52 ` Randy Dunlap
2020-06-17 16:52 ` Randy Dunlap
2020-06-23 13:35 ` Pavel Machek
2020-06-23 13:35 ` Pavel Machek
2020-12-03 6:27 ` Dmitry Torokhov
2020-12-03 6:27 ` Dmitry Torokhov
[not found] ` <3e61c9c1-b211-da9f-c55b-b44eb6522f2a-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2020-06-10 14:01 ` [PATCH v4 0/7] Support inhibiting input devices Rafael J. Wysocki
2020-06-10 14:01 ` Rafael J. Wysocki
2020-06-10 14:01 ` Rafael J. Wysocki
2020-06-10 13:52 ` Hans de Goede
2020-06-10 13:52 ` Hans de Goede
2020-06-10 13:52 ` Hans de Goede
2020-06-10 18:28 ` Dmitry Torokhov
2020-06-10 18:28 ` Dmitry Torokhov
2020-06-10 18:28 ` Dmitry Torokhov
2020-06-12 8:14 ` Hans de Goede
2020-06-12 8:14 ` Hans de Goede
2020-06-12 8:14 ` Hans de Goede
2020-06-12 8:17 ` Hans de Goede
2020-06-12 8:17 ` Hans de Goede
2020-06-12 8:17 ` Hans de Goede
2020-08-03 14:40 ` Andrzej Pietrasiewicz
2020-08-03 14:40 ` Andrzej Pietrasiewicz
2020-08-03 14:40 ` Andrzej Pietrasiewicz
2020-05-15 16:52 ` [PATCHv2 7/7] Input: elan_i2c: Support inhibiting Andrzej Pietrasiewicz
2020-05-15 16:53 ` [PATCHv2 3/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-05-18 12:40 ` Rafael J. Wysocki [this message]
2020-04-30 16:16 ` [PATCH 2/2] Input: elan_i2c: Support inhibiting Andrzej Pietrasiewicz
2020-12-03 6:29 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1834268.b3YDLlcz4u@kreacher \
--to=rjw@rjwysocki.net \
--cc=andrzej.p@collabora.com \
--cc=kernel@collabora.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.