diff --git a/drivers/sensor/sensor_shell.c b/drivers/sensor/sensor_shell.c
index fc9cf79..442fbd9 100644
--- a/drivers/sensor/sensor_shell.c
+++ b/drivers/sensor/sensor_shell.c
@@ -11,78 +11,75 @@
 #include <zephyr/device.h>
 #include <zephyr/drivers/sensor.h>
 
-#define SENSOR_GET_HELP \
-	"Get sensor data. Channel names are optional. All channels are read " \
-	"when no channels are provided. Syntax:\n" \
+#define SENSOR_GET_HELP                                                                            \
+	"Get sensor data. Channel names are optional. All channels are read "                      \
+	"when no channels are provided. Syntax:\n"                                                 \
 	"<device_name> <channel name 0> .. <channel name N>"
 
-#define SENSOR_INFO_HELP \
-	"Get sensor info, such as vendor and model name, for all sensors."
+#define SENSOR_INFO_HELP "Get sensor info, such as vendor and model name, for all sensors."
 
 const char *sensor_channel_name[SENSOR_CHAN_ALL] = {
-	[SENSOR_CHAN_ACCEL_X] =		"accel_x",
-	[SENSOR_CHAN_ACCEL_Y] =		"accel_y",
-	[SENSOR_CHAN_ACCEL_Z] =		"accel_z",
-	[SENSOR_CHAN_ACCEL_XYZ] =	"accel_xyz",
-	[SENSOR_CHAN_GYRO_X] =		"gyro_x",
-	[SENSOR_CHAN_GYRO_Y] =		"gyro_y",
-	[SENSOR_CHAN_GYRO_Z] =		"gyro_z",
-	[SENSOR_CHAN_GYRO_XYZ] =	"gyro_xyz",
-	[SENSOR_CHAN_MAGN_X] =		"magn_x",
-	[SENSOR_CHAN_MAGN_Y] =		"magn_y",
-	[SENSOR_CHAN_MAGN_Z] =		"magn_z",
-	[SENSOR_CHAN_MAGN_XYZ] =	"magn_xyz",
-	[SENSOR_CHAN_DIE_TEMP] =	"die_temp",
-	[SENSOR_CHAN_AMBIENT_TEMP] =	"ambient_temp",
-	[SENSOR_CHAN_PRESS] =		"press",
-	[SENSOR_CHAN_PROX] =		"prox",
-	[SENSOR_CHAN_HUMIDITY] =	"humidity",
-	[SENSOR_CHAN_LIGHT] =		"light",
-	[SENSOR_CHAN_IR] =		"ir",
-	[SENSOR_CHAN_RED] =		"red",
-	[SENSOR_CHAN_GREEN] =		"green",
-	[SENSOR_CHAN_BLUE] =		"blue",
-	[SENSOR_CHAN_ALTITUDE] =	"altitude",
-	[SENSOR_CHAN_PM_1_0] =		"pm_1_0",
-	[SENSOR_CHAN_PM_2_5] =		"pm_2_5",
-	[SENSOR_CHAN_PM_10] =		"pm_10",
-	[SENSOR_CHAN_DISTANCE] =	"distance",
-	[SENSOR_CHAN_CO2] =		"co2",
-	[SENSOR_CHAN_VOC] =		"voc",
-	[SENSOR_CHAN_GAS_RES] =		"gas_resistance",
-	[SENSOR_CHAN_VOLTAGE] =		"voltage",
-	[SENSOR_CHAN_CURRENT] =		"current",
-	[SENSOR_CHAN_POWER] =		"power",
-	[SENSOR_CHAN_RESISTANCE] =	"resistance",
-	[SENSOR_CHAN_ROTATION] =	"rotation",
-	[SENSOR_CHAN_POS_DX] =		"pos_dx",
-	[SENSOR_CHAN_POS_DY] =		"pos_dy",
-	[SENSOR_CHAN_POS_DZ] =		"pos_dz",
-	[SENSOR_CHAN_RPM] = 		"rpm",
-	[SENSOR_CHAN_GAUGE_VOLTAGE] =	"gauge_voltage",
+	[SENSOR_CHAN_ACCEL_X] = "accel_x",
+	[SENSOR_CHAN_ACCEL_Y] = "accel_y",
+	[SENSOR_CHAN_ACCEL_Z] = "accel_z",
+	[SENSOR_CHAN_ACCEL_XYZ] = "accel_xyz",
+	[SENSOR_CHAN_GYRO_X] = "gyro_x",
+	[SENSOR_CHAN_GYRO_Y] = "gyro_y",
+	[SENSOR_CHAN_GYRO_Z] = "gyro_z",
+	[SENSOR_CHAN_GYRO_XYZ] = "gyro_xyz",
+	[SENSOR_CHAN_MAGN_X] = "magn_x",
+	[SENSOR_CHAN_MAGN_Y] = "magn_y",
+	[SENSOR_CHAN_MAGN_Z] = "magn_z",
+	[SENSOR_CHAN_MAGN_XYZ] = "magn_xyz",
+	[SENSOR_CHAN_DIE_TEMP] = "die_temp",
+	[SENSOR_CHAN_AMBIENT_TEMP] = "ambient_temp",
+	[SENSOR_CHAN_PRESS] = "press",
+	[SENSOR_CHAN_PROX] = "prox",
+	[SENSOR_CHAN_HUMIDITY] = "humidity",
+	[SENSOR_CHAN_LIGHT] = "light",
+	[SENSOR_CHAN_IR] = "ir",
+	[SENSOR_CHAN_RED] = "red",
+	[SENSOR_CHAN_GREEN] = "green",
+	[SENSOR_CHAN_BLUE] = "blue",
+	[SENSOR_CHAN_ALTITUDE] = "altitude",
+	[SENSOR_CHAN_PM_1_0] = "pm_1_0",
+	[SENSOR_CHAN_PM_2_5] = "pm_2_5",
+	[SENSOR_CHAN_PM_10] = "pm_10",
+	[SENSOR_CHAN_DISTANCE] = "distance",
+	[SENSOR_CHAN_CO2] = "co2",
+	[SENSOR_CHAN_VOC] = "voc",
+	[SENSOR_CHAN_GAS_RES] = "gas_resistance",
+	[SENSOR_CHAN_VOLTAGE] = "voltage",
+	[SENSOR_CHAN_CURRENT] = "current",
+	[SENSOR_CHAN_POWER] = "power",
+	[SENSOR_CHAN_RESISTANCE] = "resistance",
+	[SENSOR_CHAN_ROTATION] = "rotation",
+	[SENSOR_CHAN_POS_DX] = "pos_dx",
+	[SENSOR_CHAN_POS_DY] = "pos_dy",
+	[SENSOR_CHAN_POS_DZ] = "pos_dz",
+	[SENSOR_CHAN_RPM] = "rpm",
+	[SENSOR_CHAN_GAUGE_VOLTAGE] = "gauge_voltage",
 	[SENSOR_CHAN_GAUGE_AVG_CURRENT] = "gauge_avg_current",
 	[SENSOR_CHAN_GAUGE_STDBY_CURRENT] = "gauge_stdby_current",
 	[SENSOR_CHAN_GAUGE_MAX_LOAD_CURRENT] = "gauge_max_load_current",
-	[SENSOR_CHAN_GAUGE_TEMP] =	"gauge_temp",
-	[SENSOR_CHAN_GAUGE_STATE_OF_CHARGE] =	"gauge_state_of_charge",
-	[SENSOR_CHAN_GAUGE_FULL_CHARGE_CAPACITY] =	"gauge_full_cap",
+	[SENSOR_CHAN_GAUGE_TEMP] = "gauge_temp",
+	[SENSOR_CHAN_GAUGE_STATE_OF_CHARGE] = "gauge_state_of_charge",
+	[SENSOR_CHAN_GAUGE_FULL_CHARGE_CAPACITY] = "gauge_full_cap",
 	[SENSOR_CHAN_GAUGE_REMAINING_CHARGE_CAPACITY] = "gauge_remaining_cap",
-	[SENSOR_CHAN_GAUGE_NOM_AVAIL_CAPACITY] =	"gauge_nominal_cap",
+	[SENSOR_CHAN_GAUGE_NOM_AVAIL_CAPACITY] = "gauge_nominal_cap",
 	[SENSOR_CHAN_GAUGE_FULL_AVAIL_CAPACITY] = "gauge_full_avail_cap",
-	[SENSOR_CHAN_GAUGE_AVG_POWER] =		"gauge_avg_power",
-	[SENSOR_CHAN_GAUGE_STATE_OF_HEALTH] =	"gauge_state_of_health",
-	[SENSOR_CHAN_GAUGE_TIME_TO_EMPTY] =	"gauge_time_to_empty",
-	[SENSOR_CHAN_GAUGE_TIME_TO_FULL] =	"gauge_time_to_full",
-	[SENSOR_CHAN_GAUGE_CYCLE_COUNT] =	"gauge_cycle_count",
-	[SENSOR_CHAN_GAUGE_DESIGN_VOLTAGE] =	"gauge_design_voltage",
-	[SENSOR_CHAN_GAUGE_DESIRED_VOLTAGE] =	"gauge_desired_voltage",
-	[SENSOR_CHAN_GAUGE_DESIRED_CHARGING_CURRENT] =
-		 "gauge_desired_charging_current",
+	[SENSOR_CHAN_GAUGE_AVG_POWER] = "gauge_avg_power",
+	[SENSOR_CHAN_GAUGE_STATE_OF_HEALTH] = "gauge_state_of_health",
+	[SENSOR_CHAN_GAUGE_TIME_TO_EMPTY] = "gauge_time_to_empty",
+	[SENSOR_CHAN_GAUGE_TIME_TO_FULL] = "gauge_time_to_full",
+	[SENSOR_CHAN_GAUGE_CYCLE_COUNT] = "gauge_cycle_count",
+	[SENSOR_CHAN_GAUGE_DESIGN_VOLTAGE] = "gauge_design_voltage",
+	[SENSOR_CHAN_GAUGE_DESIRED_VOLTAGE] = "gauge_desired_voltage",
+	[SENSOR_CHAN_GAUGE_DESIRED_CHARGING_CURRENT] = "gauge_desired_charging_current",
 };
 
-static int handle_channel_by_name(const struct shell *shell,
-					const struct device *dev,
-					const char *channel_name)
+static int handle_channel_by_name(const struct shell *shell, const struct device *dev,
+				  const char *channel_name)
 {
 	struct sensor_value value[3];
 	char *endptr;
@@ -101,8 +98,7 @@
 		}
 
 		if (i == ARRAY_SIZE(sensor_channel_name)) {
-			shell_error(shell, "Channel not supported (%s)",
-				    channel_name);
+			shell_error(shell, "Channel not supported (%s)", channel_name);
 			return -ENOTSUP;
 		}
 	}
@@ -115,20 +111,19 @@
 	if (i >= ARRAY_SIZE(sensor_channel_name)) {
 		shell_print(shell, "channel idx=%d value = %10.6f", i,
 			    sensor_value_to_double(&value[0]));
-	} else if (i != SENSOR_CHAN_ACCEL_XYZ &&
-		i != SENSOR_CHAN_GYRO_XYZ &&
-		i != SENSOR_CHAN_MAGN_XYZ) {
-		shell_print(shell,
-			"channel idx=%d %s = %10.6f", i,
-			sensor_channel_name[i],
-			sensor_value_to_double(&value[0]));
+	} else if (i != SENSOR_CHAN_ACCEL_XYZ && i != SENSOR_CHAN_GYRO_XYZ &&
+		   i != SENSOR_CHAN_MAGN_XYZ) {
+		shell_print(shell, "channel idx=%d %s = %10.6f", i, sensor_channel_name[i],
+			    sensor_value_to_double(&value[0]));
 	} else {
+		/* clang-format off */
 		shell_print(shell,
 			"channel idx=%d %s x = %10.6f y = %10.6f z = %10.6f",
 			i, sensor_channel_name[i],
 			sensor_value_to_double(&value[0]),
 			sensor_value_to_double(&value[1]),
 			sensor_value_to_double(&value[2]));
+		/* clang-format on */
 	}
 
 	return 0;
@@ -153,16 +148,14 @@
 		/* read all channels */
 		for (int i = 0; i < ARRAY_SIZE(sensor_channel_name); i++) {
 			if (sensor_channel_name[i]) {
-				handle_channel_by_name(shell, dev,
-							sensor_channel_name[i]);
+				handle_channel_by_name(shell, dev, sensor_channel_name[i]);
 			}
 		}
 	} else {
 		for (int i = 2; i < argc; i++) {
 			err = handle_channel_by_name(shell, dev, argv[i]);
 			if (err < 0) {
-				shell_error(shell,
-					"Failed to read channel (%s)", argv[i]);
+				shell_error(shell, "Failed to read channel (%s)", argv[i]);
 			}
 		}
 	}
@@ -180,7 +173,7 @@
 
 	entry->syntax = NULL;
 	entry->handler = NULL;
-	entry->help  = NULL;
+	entry->help = NULL;
 	entry->subcmd = &dsub_channel_name;
 
 	for (int i = 0; i < SENSOR_CHAN_ALL; i++) {
@@ -204,13 +197,11 @@
 
 	entry->syntax = (dev != NULL) ? dev->name : NULL;
 	entry->handler = NULL;
-	entry->help  = NULL;
+	entry->help = NULL;
 	entry->subcmd = &dsub_channel_name;
 }
 
-
-static int cmd_get_sensor_info(const struct shell *sh, size_t argc,
-		char **argv)
+static int cmd_get_sensor_info(const struct shell *sh, size_t argc, char **argv)
 {
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
@@ -218,12 +209,12 @@
 #ifdef CONFIG_SENSOR_INFO
 	const char *null_str = "(null)";
 
-	STRUCT_SECTION_FOREACH(sensor_info, sensor) {
+	STRUCT_SECTION_FOREACH(sensor_info, sensor)
+	{
 		shell_print(sh,
 			    "device name: %s, vendor: %s, model: %s, "
 			    "friendly name: %s",
-			    sensor->dev->name,
-			    sensor->vendor ? sensor->vendor : null_str,
+			    sensor->dev->name, sensor->vendor ? sensor->vendor : null_str,
 			    sensor->model ? sensor->model : null_str,
 			    sensor->friendly_name ? sensor->friendly_name : null_str);
 	}
@@ -233,6 +224,7 @@
 #endif
 }
 
+/* clang-format off */
 SHELL_STATIC_SUBCMD_SET_CREATE(sub_sensor,
 	SHELL_CMD_ARG(get, &dsub_device_name, SENSOR_GET_HELP, cmd_get_sensor,
 			2, 255),
@@ -240,5 +232,6 @@
 			cmd_get_sensor_info),
 	SHELL_SUBCMD_SET_END
 	);
+/* clang-format on */
 
 SHELL_CMD_REGISTER(sensor, &sub_sensor, "Sensor commands", NULL);