From ed0af24406041006752ac83c357d728a1566a945 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 22 Feb 2021 21:27:16 +0000 Subject: [PATCH] trivial: Use fwupd_device_remove_flag() to remove a single flag --- libfwupdplugin/fu-plugin.c | 3 +-- plugins/uefi-capsule/fu-plugin-uefi-capsule.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libfwupdplugin/fu-plugin.c b/libfwupdplugin/fu-plugin.c index de246f33a..039460bff 100644 --- a/libfwupdplugin/fu-plugin.c +++ b/libfwupdplugin/fu-plugin.c @@ -2348,8 +2348,7 @@ fu_plugin_runner_unlock (FuPlugin *self, FuDevice *device, GError **error) return FALSE; /* update with correct flags */ - flags = fu_device_get_flags (device); - fu_device_set_flags (device, flags &= ~FWUPD_DEVICE_FLAG_LOCKED); + fu_device_remove_flag (device, FWUPD_DEVICE_FLAG_LOCKED); fu_device_set_modified (device, (guint64) g_get_real_time () / G_USEC_PER_SEC); return TRUE; } diff --git a/plugins/uefi-capsule/fu-plugin-uefi-capsule.c b/plugins/uefi-capsule/fu-plugin-uefi-capsule.c index 6c7abc0f1..8338cfa9f 100644 --- a/plugins/uefi-capsule/fu-plugin-uefi-capsule.c +++ b/plugins/uefi-capsule/fu-plugin-uefi-capsule.c @@ -747,7 +747,7 @@ fu_plugin_unlock (FuPlugin *plugin, FuDevice *device, GError **error) /* clone the info from real device but prevent it from being flashed */ device_flags_alt = fu_device_get_flags (device_alt); fu_device_set_flags (device, device_flags_alt); - fu_device_set_flags (device_alt, device_flags_alt & ~FWUPD_DEVICE_FLAG_UPDATABLE); + fu_device_remove_flag (device_alt, FWUPD_DEVICE_FLAG_UPDATABLE); /* make sure that this unlocked device can be updated */ fu_device_set_version_format (device, FWUPD_VERSION_FORMAT_QUAD);