2020-10-27 08:00:12

by Arnd Bergmann

Subject: [PATCH] ACPI: dock: fix enum-conversion warning

From: Arnd Bergmann <[email protected]>

gcc points out a type mismatch:

drivers/acpi/dock.c: In function 'hot_remove_dock_devices':
drivers/acpi/dock.c:234:53: warning: implicit conversion from 'enum <anonymous>' to 'enum dock_callback_type' [-Wenum-conversion]
234 | dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);

This is harmless because 'false' still has the correct numeric value,
but passing DOCK_CALL_HANDLER documents better what is going on
and avoids the warning.

Fixes: 37f908778f20 ("ACPI / dock: Walk list in reverse order during removal of devices")
Fixes: f09ce741a03a ("ACPI / dock / PCI: Drop ACPI dock notifier chain")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/acpi/dock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 45d4b7b69de8..24e076f44d23 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -231,7 +231,8 @@ static void hot_remove_dock_devices(struct dock_station *ds)
* between them).
*/
list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
- dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
+ dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST,
+ DOCK_CALL_HANDLER);

list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
acpi_bus_trim(dd->adev);
--
2.27.0

2020-10-27 13:52:53

by Hanjun Guo

Subject: Re: [PATCH] ACPI: dock: fix enum-conversion warning

On 2020/10/27 5:48, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> gcc points out a type mismatch:
>
> drivers/acpi/dock.c: In function 'hot_remove_dock_devices':
> drivers/acpi/dock.c:234:53: warning: implicit conversion from 'enum <anonymous>' to 'enum dock_callback_type' [-Wenum-conversion]
> 234 | dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
>
> This is harmless because 'false' still has the correct numeric value,
> but passing DOCK_CALL_HANDLER documents better what is going on
> and avoids the warning.
>
> Fixes: 37f908778f20 ("ACPI / dock: Walk list in reverse order during removal of devices")
> Fixes: f09ce741a03a ("ACPI / dock / PCI: Drop ACPI dock notifier chain")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/acpi/dock.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
> index 45d4b7b69de8..24e076f44d23 100644
> --- a/drivers/acpi/dock.c
> +++ b/drivers/acpi/dock.c
> @@ -231,7 +231,8 @@ static void hot_remove_dock_devices(struct dock_station *ds)
> * between them).
> */
> list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
> - dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
> + dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST,
> + DOCK_CALL_HANDLER);
>
> list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
> acpi_bus_trim(dd->adev);

Reviewed-by: Hanjun Guo <[email protected]>

2020-10-28 19:51:17

by Rafael J. Wysocki

Subject: Re: [PATCH] ACPI: dock: fix enum-conversion warning

On Mon, Oct 26, 2020 at 10:48 PM Arnd Bergmann <[email protected]> wrote:
>
> From: Arnd Bergmann <[email protected]>
>
> gcc points out a type mismatch:
>
> drivers/acpi/dock.c: In function 'hot_remove_dock_devices':
> drivers/acpi/dock.c:234:53: warning: implicit conversion from 'enum <anonymous>' to 'enum dock_callback_type' [-Wenum-conversion]
> 234 | dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
>
> This is harmless because 'false' still has the correct numeric value,
> but passing DOCK_CALL_HANDLER documents better what is going on
> and avoids the warning.
>
> Fixes: 37f908778f20 ("ACPI / dock: Walk list in reverse order during removal of devices")
> Fixes: f09ce741a03a ("ACPI / dock / PCI: Drop ACPI dock notifier chain")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/acpi/dock.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
> index 45d4b7b69de8..24e076f44d23 100644
> --- a/drivers/acpi/dock.c
> +++ b/drivers/acpi/dock.c
> @@ -231,7 +231,8 @@ static void hot_remove_dock_devices(struct dock_station *ds)
> * between them).
> */
> list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
> - dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST, false);
> + dock_hotplug_event(dd, ACPI_NOTIFY_EJECT_REQUEST,
> + DOCK_CALL_HANDLER);
>
> list_for_each_entry_reverse(dd, &ds->dependent_devices, list)
> acpi_bus_trim(dd->adev);
> --

Applied as 5.10-rc material, thanks!