From dc1730c439cc76715f7e3a8bb71e936733ce9fc8 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 22 Jun 2022 15:55:32 +0100 Subject: [PATCH] trivial: Some clang-format fixups --- plugins/ccgx/fu-ccgx-dmc-device.c | 2 +- plugins/dell/fu-plugin-dell.c | 6 +++--- plugins/intel-spi/fu-intel-spi-device.c | 1 - plugins/redfish/fu-ipmi-device.c | 28 ++++++++++++------------- plugins/wacom-usb/fu-wac-firmware.c | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/plugins/ccgx/fu-ccgx-dmc-device.c b/plugins/ccgx/fu-ccgx-dmc-device.c index 100e24338..7ea9b935a 100644 --- a/plugins/ccgx/fu-ccgx-dmc-device.c +++ b/plugins/ccgx/fu-ccgx-dmc-device.c @@ -729,7 +729,7 @@ static void fu_ccgx_dmc_device_set_progress(FuDevice *self, FuProgress *progress) { fu_progress_set_id(progress, G_STRLOC); - fu_progress_add_flag(progress, FU_PROGRESS_FLAG_NO_PROFILE); /* actually 0, 20, 0, 80! */ + fu_progress_add_flag(progress, FU_PROGRESS_FLAG_NO_PROFILE); /* actually 0, 20, 0, 80! */ fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_RESTART, 0, "detach"); fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_WRITE, 75, "write"); fu_progress_add_step(progress, FWUPD_STATUS_DEVICE_RESTART, 0, "attach"); diff --git a/plugins/dell/fu-plugin-dell.c b/plugins/dell/fu-plugin-dell.c index e6127dbe1..88c278c24 100644 --- a/plugins/dell/fu-plugin-dell.c +++ b/plugins/dell/fu-plugin-dell.c @@ -7,14 +7,14 @@ #include "config.h" +#include + #include #include #include #include -#include - #include -#include +#include #include "fu-plugin-dell.h" diff --git a/plugins/intel-spi/fu-intel-spi-device.c b/plugins/intel-spi/fu-intel-spi-device.c index 061422661..f5d6bde9e 100644 --- a/plugins/intel-spi/fu-intel-spi-device.c +++ b/plugins/intel-spi/fu-intel-spi-device.c @@ -487,7 +487,6 @@ fu_intel_spi_device_set_quirk_kv(FuDevice *device, return TRUE; } if (g_strcmp0(key, "IntelSpiKind") == 0) { - /* validate */ self->kind = fu_intel_spi_kind_from_string(value); if (self->kind == FU_INTEL_SPI_KIND_UNKNOWN) { diff --git a/plugins/redfish/fu-ipmi-device.c b/plugins/redfish/fu-ipmi-device.c index f020620f7..d436a2af6 100644 --- a/plugins/redfish/fu-ipmi-device.c +++ b/plugins/redfish/fu-ipmi-device.c @@ -37,20 +37,20 @@ #define IPMI_PASSWORD_TEST_PASSWORD 0x03 /* these are not provided in ipmi_msgdefs.h */ -#define IPMI_INVALID_COMMAND_ON_LUN_ERR 0xC2 -#define IPMI_OUT_OF_SPACE_ERR 0xC4 -#define IPMI_CANCELLED_OR_INVALID_ERR 0xC5 -#define IPMI_OUT_OF_RANGE_ERR 0xC9 -#define IPMI_CANNOT_RETURN_DATA_ERR 0xCA -#define IPMI_NOT_FOUND_ERR 0xCB -#define IPMI_INVALID_DATA_FIELD_ERR 0xCC -#define IPMI_COMMAND_ILLEGAL_ERR 0xCD -#define IPMI_RESPONSE_NOT_PROVIDED_ERR 0xCE -#define IPMI_DUPLICATED_REQUEST_ERR 0xCF -#define IPMI_SDR_IN_UPDATE_MODE_ERR 0xD0 -#define IPMI_DESTINATION_UNAVAILABLE_ERR 0xD3 -#define IPMI_INSUFFICIENT_PRIVILEGE_ERR 0xD4 -#define IPMI_COMMAND_DISABLED_ERR 0xD6 +#define IPMI_INVALID_COMMAND_ON_LUN_ERR 0xC2 +#define IPMI_OUT_OF_SPACE_ERR 0xC4 +#define IPMI_CANCELLED_OR_INVALID_ERR 0xC5 +#define IPMI_OUT_OF_RANGE_ERR 0xC9 +#define IPMI_CANNOT_RETURN_DATA_ERR 0xCA +#define IPMI_NOT_FOUND_ERR 0xCB +#define IPMI_INVALID_DATA_FIELD_ERR 0xCC +#define IPMI_COMMAND_ILLEGAL_ERR 0xCD +#define IPMI_RESPONSE_NOT_PROVIDED_ERR 0xCE +#define IPMI_DUPLICATED_REQUEST_ERR 0xCF +#define IPMI_SDR_IN_UPDATE_MODE_ERR 0xD0 +#define IPMI_DESTINATION_UNAVAILABLE_ERR 0xD3 +#define IPMI_INSUFFICIENT_PRIVILEGE_ERR 0xD4 +#define IPMI_COMMAND_DISABLED_ERR 0xD6 #ifndef IPMI_DEVICE_IN_UPDATE_MODE_ERR #define IPMI_DEVICE_IN_UPDATE_MODE_ERR 0xD1 diff --git a/plugins/wacom-usb/fu-wac-firmware.c b/plugins/wacom-usb/fu-wac-firmware.c index 726659945..afcac2414 100644 --- a/plugins/wacom-usb/fu-wac-firmware.c +++ b/plugins/wacom-usb/fu-wac-firmware.c @@ -18,7 +18,7 @@ struct _FuWacFirmware { G_DEFINE_TYPE(FuWacFirmware, fu_wac_firmware, FU_TYPE_FIRMWARE) -#define FU_WAC_FIRMWARE_TOKENS_MAX 100000 /* lines */ +#define FU_WAC_FIRMWARE_TOKENS_MAX 100000 /* lines */ #define FU_WAC_FIRMWARE_SECTIONS_MAX 10 typedef struct {