diff mbox series

ACPI: dock: fix enum-conversion warning

Message ID 20201026214838.3892471-1-arnd@kernel.org
State New
Headers show
Series ACPI: dock: fix enum-conversion warning | expand

Commit Message

Arnd Bergmann Oct. 26, 2020, 9:48 p.m. UTC
From: Arnd Bergmann <arnd@arndb.de>


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 <arnd@arndb.de>

---
 drivers/acpi/dock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.27.0

Comments

Hanjun Guo Oct. 27, 2020, 1:10 a.m. UTC | #1
On 2020/10/27 5:48, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>

> 

> 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 <arnd@arndb.de>

> ---

>   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 <guohanjun@huawei.com>
Rafael J. Wysocki Oct. 27, 2020, 6:31 p.m. UTC | #2
On Mon, Oct 26, 2020 at 10:48 PM Arnd Bergmann <arnd@kernel.org> wrote:
>

> From: Arnd Bergmann <arnd@arndb.de>

>

> 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 <arnd@arndb.de>

> ---

>  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!
diff mbox series

Patch

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);