drivers: wifi: siwx91x: Align the ways errors are managed

Unify the way the error code are tested:
  - sl_status_t is an alias to an int. The compiler won't complain if an
    int is assigned or compared to a sl_status_t. In the other hand,
    "int" is well known to manage error code. So, just use "int"
    everywhere.
  - Always name the return code "ret"
  - Unless it is meaningful, test the value of ret against 0
    (SL_STATUS_OK is just a convoluted way to say 0).

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>

Author: jerome-pouiller

drivers/wifi/siwx91x/siwx91x_wifi.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 Antmicro
- * Copyright (c) 2024 Silicon Laboratories Inc.
+ * Copyright (c) 2024-2025 Silicon Laboratories Inc.
  * SPDX-License-Identifier: Apache-2.0
  */
 #define DT_DRV_COMPAT silabs_siwx91x_wifi
@@ -79,7 +79,7 @@ int siwx91x_status(const struct device *dev, struct wifi_iface_status *status)
 		status->twt_capable = true;
 
 		ret = sl_si91x_get_join_configuration(interface, &join_config);
-		if (ret != SL_STATUS_OK) {
+		if (ret) {
 			LOG_ERR("Failed to get join configuration: 0x%x", ret);
 			return -EINVAL;
 		}
@@ -324,16 +324,16 @@ static int siwx91x_get_version(const struct device *dev, struct wifi_version *pa
 	sl_wifi_firmware_version_t fw_version = { };
 	struct siwx91x_dev *sidev = dev->data;
 	static char fw_version_str[32];
-	sl_status_t status;
+	int ret;
 
 	__ASSERT(params, "params cannot be NULL");
 
 	if (sidev->state == WIFI_STATE_INTERFACE_DISABLED) {
 		return -EIO;
 	}
 
-	status = sl_wifi_get_firmware_version(&fw_version);
-	if (status != SL_STATUS_OK) {
+	ret = sl_wifi_get_firmware_version(&fw_version);
+	if (ret) {
 		return -EINVAL;
 	}
 
@@ -352,7 +352,7 @@ static int siwx91x_get_version(const struct device *dev, struct wifi_version *pa
 static void siwx91x_iface_init(struct net_if *iface)
 {
 	struct siwx91x_dev *sidev = iface->if_dev->dev->data;
-	sl_status_t status;
+	int ret;
 
 	sidev->state = WIFI_STATE_INTERFACE_DISABLED;
 	sidev->iface = iface;
@@ -367,9 +367,9 @@ static void siwx91x_iface_init(struct net_if *iface)
 	sl_wifi_set_callback(SL_WIFI_STATS_RESPONSE_EVENTS, siwx91x_wifi_module_stats_event_handler,
 			     sidev);
 
-	status = sl_wifi_get_mac_address(SL_WIFI_CLIENT_INTERFACE, &sidev->macaddr);
-	if (status) {
-		LOG_ERR("sl_wifi_get_mac_address(): %#04x", status);
+	ret = sl_wifi_get_mac_address(SL_WIFI_CLIENT_INTERFACE, &sidev->macaddr);
+	if (ret) {
+		LOG_ERR("sl_wifi_get_mac_address(): %#04x", ret);
 		return;
 	}
 	net_if_set_link_addr(iface, sidev->macaddr.octet, sizeof(sidev->macaddr.octet),

drivers/wifi/siwx91x/siwx91x_wifi_ap.c

@@ -87,7 +87,7 @@ int siwx91x_ap_disable(const struct device *dev)
 	}
 	wifi_mgmt_raise_ap_disable_result_event(sidev->iface, WIFI_STATUS_AP_SUCCESS);
 	sidev->state = WIFI_STATE_INTERFACE_DISABLED;
-	return ret;
+	return 0;
 }
 
 static int siwx91x_ap_disable_if_required(const struct device *dev,
@@ -131,10 +131,6 @@ int siwx91x_ap_enable(const struct device *dev, struct wifi_connect_req_params *
 {
 	sl_wifi_interface_t interface = sl_wifi_get_default_interface();
 	struct siwx91x_dev *sidev = dev->data;
-	sl_wifi_ap_configuration_t saved_ap_cfg;
-	int ret;
-	int sec;
-
 	sl_wifi_ap_configuration_t siwx91x_ap_cfg = {
 		.credential_id       = SL_NET_DEFAULT_WIFI_AP_CREDENTIAL_ID,
 		.keepalive_type      = SL_SI91X_AP_NULL_BASED_KEEP_ALIVE,
@@ -150,6 +146,8 @@ int siwx91x_ap_enable(const struct device *dev, struct wifi_connect_req_params *
 		.options             = 0,
 		.is_11n_enabled      = 1,
 	};
+	sl_wifi_ap_configuration_t saved_ap_cfg;
+	int ret;
 
 	if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) != SL_WIFI_AP_INTERFACE) {
 		LOG_ERR("Interface not in AP mode");
@@ -189,19 +187,19 @@ int siwx91x_ap_enable(const struct device *dev, struct wifi_connect_req_params *
 		return -EINVAL;
 	}
 
-	sec = siwx91x_map_ap_security(params->security);
-	if (sec < 0) {
+	ret = siwx91x_map_ap_security(params->security);
+	if (ret < 0) {
 		LOG_ERR("Invalid security type");
 		wifi_mgmt_raise_ap_enable_result_event(sidev->iface,
 						       WIFI_STATUS_AP_AUTH_TYPE_NOT_SUPPORTED);
 		return -EINVAL;
 	}
+	siwx91x_ap_cfg.security = ret;
 
-	siwx91x_ap_cfg.security = sec;
 	if (params->security != WIFI_SECURITY_TYPE_NONE) {
 		ret = sl_net_set_credential(siwx91x_ap_cfg.credential_id, SL_NET_WIFI_PSK,
 					    params->psk, params->psk_length);
-		if (ret != SL_STATUS_OK) {
+		if (ret) {
 			LOG_ERR("Failed to set credentials: 0x%x", ret);
 			wifi_mgmt_raise_ap_enable_result_event(sidev->iface, WIFI_STATUS_AP_FAIL);
 			return -EINVAL;
@@ -233,7 +231,7 @@ int siwx91x_ap_enable(const struct device *dev, struct wifi_connect_req_params *
 	}
 
 	ret = sl_wifi_start_ap(SL_WIFI_AP_INTERFACE | SL_WIFI_2_4GHZ_INTERFACE, &siwx91x_ap_cfg);
-	if (ret != SL_STATUS_OK) {
+	if (ret) {
 		LOG_ERR("Failed to enable AP mode: 0x%x", ret);
 		wifi_mgmt_raise_ap_enable_result_event(sidev->iface, WIFI_STATUS_AP_FAIL);
 		return -EIO;

drivers/wifi/siwx91x/siwx91x_wifi_ps.c

@@ -20,15 +20,15 @@ static int siwx91x_get_connected_ap_beacon_interval_ms(void)
 {
 	sl_wifi_operational_statistics_t sl_stat;
 	sl_wifi_interface_t interface;
-	int status;
+	int ret;
 
 	interface = sl_wifi_get_default_interface();
 	if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) != SL_WIFI_CLIENT_INTERFACE) {
 		return 0;
 	}
 
-	status = sl_wifi_get_operational_statistics(SL_WIFI_CLIENT_INTERFACE, &sl_stat);
-	if (status) {
+	ret = sl_wifi_get_operational_statistics(SL_WIFI_CLIENT_INTERFACE, &sl_stat);
+	if (ret) {
 		return 0;
 	}
 
@@ -40,7 +40,7 @@ int siwx91x_apply_power_save(struct siwx91x_dev *sidev)
 	sl_wifi_performance_profile_t sl_ps_profile;
 	sl_wifi_interface_t interface;
 	int beacon_interval;
-	int status;
+	int ret;
 
 	interface = sl_wifi_get_default_interface();
 	if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) != SL_WIFI_CLIENT_INTERFACE) {
@@ -90,14 +90,14 @@ int siwx91x_apply_power_save(struct siwx91x_dev *sidev)
 	}
 
 out:
-	status = sl_wifi_set_performance_profile(&sl_ps_profile);
-	return status ? -EIO : 0;
+	ret = sl_wifi_set_performance_profile(&sl_ps_profile);
+	return ret ? -EIO : 0;
 }
 
 int siwx91x_set_power_save(const struct device *dev, struct wifi_ps_params *params)
 {
 	struct siwx91x_dev *sidev = dev->data;
-	int status;
+	int ret;
 
 	__ASSERT(params, "params cannot be NULL");
 
@@ -143,10 +143,10 @@ int siwx91x_set_power_save(const struct device *dev, struct wifi_ps_params *para
 		params->fail_reason = WIFI_PS_PARAM_FAIL_CMD_EXEC_FAIL;
 		return -EINVAL;
 	}
-	status = siwx91x_apply_power_save(sidev);
-	if (status) {
+	ret = siwx91x_apply_power_save(sidev);
+	if (ret) {
 		params->fail_reason = WIFI_PS_PARAM_FAIL_CMD_EXEC_FAIL;
-		return status;
+		return ret;
 	}
 	return 0;
 }
@@ -157,7 +157,7 @@ int siwx91x_get_power_save_config(const struct device *dev, struct wifi_ps_confi
 	struct siwx91x_dev *sidev = dev->data;
 	sl_wifi_interface_t interface;
 	uint16_t beacon_interval;
-	sl_status_t status;
+	int ret;
 
 	__ASSERT(config, "config cannot be NULL");
 
@@ -172,9 +172,9 @@ int siwx91x_get_power_save_config(const struct device *dev, struct wifi_ps_confi
 		return -EINVAL;
 	}
 
-	status = sl_wifi_get_performance_profile(&sl_ps_profile);
-	if (status != SL_STATUS_OK) {
-		LOG_ERR("Failed to get power save profile: 0x%x", status);
+	ret = sl_wifi_get_performance_profile(&sl_ps_profile);
+	if (ret) {
+		LOG_ERR("Failed to get power save profile: 0x%x", ret);
 		return -EIO;
 	}
 
@@ -229,9 +229,7 @@ static int siwx91x_convert_z_sl_twt_req_type(enum wifi_twt_setup_cmd z_req_cmd)
 
 static int siwx91x_set_twt_setup(struct wifi_twt_params *params)
 {
-	sl_status_t status;
 	int twt_req_type = siwx91x_convert_z_sl_twt_req_type(params->setup_cmd);
-
 	sl_wifi_twt_request_t twt_req = {
 		.twt_retry_interval = 5,
 		.wake_duration_unit = 0,
@@ -245,6 +243,7 @@ static int siwx91x_set_twt_setup(struct wifi_twt_params *params)
 		.twt_enable = 1,
 		.req_type = twt_req_type,
 	};
+	int ret;
 
 	if (twt_req_type < 0) {
 		params->fail_reason = WIFI_TWT_FAIL_CMD_EXEC_FAIL;
@@ -278,8 +277,8 @@ static int siwx91x_set_twt_setup(struct wifi_twt_params *params)
 		twt_req.wake_duration = params->setup.twt_wake_interval / 256;
 	}
 
-	status = sl_wifi_enable_target_wake_time(&twt_req);
-	if (status != SL_STATUS_OK) {
+	ret = sl_wifi_enable_target_wake_time(&twt_req);
+	if (ret) {
 		params->fail_reason = WIFI_TWT_FAIL_CMD_EXEC_FAIL;
 		params->resp_status = WIFI_TWT_RESP_NOT_RECEIVED;
 		return -EINVAL;
@@ -290,8 +289,8 @@ static int siwx91x_set_twt_setup(struct wifi_twt_params *params)
 
 static int siwx91x_set_twt_teardown(struct wifi_twt_params *params)
 {
-	sl_status_t status;
 	sl_wifi_twt_request_t twt_req = { };
+	int ret;
 
 	twt_req.twt_enable = 0;
 
@@ -301,8 +300,8 @@ static int siwx91x_set_twt_teardown(struct wifi_twt_params *params)
 		twt_req.twt_flow_id = params->flow_id;
 	}
 
-	status = sl_wifi_disable_target_wake_time(&twt_req);
-	if (status != SL_STATUS_OK) {
+	ret = sl_wifi_disable_target_wake_time(&twt_req);
+	if (ret) {
 		params->fail_reason = WIFI_TWT_FAIL_CMD_EXEC_FAIL;
 		params->teardown_status = WIFI_TWT_TEARDOWN_FAILED;
 		return -EINVAL;

drivers/wifi/siwx91x/siwx91x_wifi_scan.c

@@ -31,7 +31,6 @@ static void siwx91x_report_scan_res(struct siwx91x_dev *sidev, sl_wifi_scan_resu
 		{ SL_WIFI_WPA_ENTERPRISE,  WIFI_SECURITY_TYPE_EAP     },
 		{ SL_WIFI_WPA2_ENTERPRISE, WIFI_SECURITY_TYPE_EAP     },
 	};
-
 	struct wifi_scan_result tmp = {
 		.channel = result->scan_info[item].rf_channel,
 		.rssi = result->scan_info[item].rssi_val,
@@ -98,7 +97,7 @@ siwx91x_configure_scan_dwell_time(sl_wifi_scan_type_t scan_type, uint16_t dwell_
 				  uint16_t dwell_time_passive,
 				  sl_wifi_advanced_scan_configuration_t *advanced_scan_config)
 {
-	int ret = 0;
+	int ret;
 
 	if (dwell_time_active && (dwell_time_active < 5 || dwell_time_active > 1000)) {
 		LOG_ERR("Invalid active scan dwell time");
@@ -114,14 +113,14 @@ siwx91x_configure_scan_dwell_time(sl_wifi_scan_type_t scan_type, uint16_t dwell_
 	case SL_WIFI_SCAN_TYPE_ACTIVE:
 		ret = sl_si91x_configure_timeout(SL_SI91X_CHANNEL_ACTIVE_SCAN_TIMEOUT,
 						 dwell_time_active);
-		break;
+		return ret;
 	case SL_WIFI_SCAN_TYPE_PASSIVE:
 		if (!dwell_time_passive) {
 			dwell_time_passive = SIWX91X_DEFAULT_PASSIVE_SCAN_DWELL_TIME;
 		}
 		ret = sl_si91x_configure_timeout(SL_SI91X_CHANNEL_PASSIVE_SCAN_TIMEOUT,
 						 dwell_time_passive);
-		break;
+		return ret;
 	case SL_WIFI_SCAN_TYPE_ADV_SCAN:
 		__ASSERT(advanced_scan_config, "advanced_scan_config cannot be NULL");
 
@@ -134,12 +133,10 @@ siwx91x_configure_scan_dwell_time(sl_wifi_scan_type_t scan_type, uint16_t dwell_
 			dwell_time_passive = CONFIG_WIFI_SILABS_SIWX91X_ADV_PASSIVE_SCAN_DURATION;
 		}
 		advanced_scan_config->passive_channel_time = dwell_time_passive;
-		break;
+		return 0;
 	default:
-		break;
+		return 0;
 	}
-
-	return ret;
 }
 
 int siwx91x_scan(const struct device *dev, struct wifi_scan_params *z_scan_config,
@@ -191,14 +188,14 @@ int siwx91x_scan(const struct device *dev, struct wifi_scan_params *z_scan_confi
 						  &advanced_scan_config);
 
 		ret = sl_wifi_set_advanced_scan_configuration(&advanced_scan_config);
-		if (ret != SL_STATUS_OK) {
-			LOG_ERR("advanced scan configuration failed with status %x", ret);
+		if (ret) {
+			LOG_ERR("Advanced scan configuration failed with status %x", ret);
 			return -EINVAL;
 		}
 
 		ret = sl_wifi_set_roam_configuration(interface, &roam_configuration);
-		if (ret != SL_STATUS_OK) {
-			LOG_ERR("roaming configuration failed with status %x", ret);
+		if (ret) {
+			LOG_ERR("Roaming configuration failed with status %x", ret);
 			return -EINVAL;
 		}
 
@@ -219,7 +216,7 @@ int siwx91x_scan(const struct device *dev, struct wifi_scan_params *z_scan_confi
 								z_scan_config->dwell_time_passive,
 								NULL);
 		}
-		if (ret != SL_STATUS_OK) {
+		if (ret) {
 			LOG_ERR("Failed to configure timeout");
 			return -EINVAL;
 		}

drivers/wifi/siwx91x/siwx91x_wifi_socket.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 Antmicro
- * Copyright (c) 2024 Silicon Laboratories Inc.
+ * Copyright (c) 2024-2025 Silicon Laboratories Inc.
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/net/net_offload.h>

drivers/wifi/siwx91x/siwx91x_wifi_sta.c

@@ -196,7 +196,7 @@ int siwx91x_disconnect(const struct device *dev)
 	}
 
 	ret = sl_wifi_disconnect(interface);
-	if (ret != SL_STATUS_OK) {
+	if (ret) {
 		wifi_mgmt_raise_disconnect_result_event(sidev->iface, ret);
 		return -EIO;
 	}
@@ -254,7 +254,7 @@ int siwx91x_connect(const struct device *dev, struct wifi_connect_req_params *pa
 	};
 	struct siwx91x_dev *sidev = dev->data;
 	enum wifi_mfp_options mfp_conf;
-	int ret = 0;
+	int ret;
 
 	if (sidev->state == WIFI_STATE_COMPLETED) {
 		ret = siwx91x_disconnect_if_required(dev, params);
@@ -311,9 +311,11 @@ int siwx91x_connect(const struct device *dev, struct wifi_connect_req_params *pa
 		ret = sl_net_set_credential(SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID,
 					    SL_NET_WIFI_PSK, params->sae_password,
 					    params->sae_password_length);
+	} else {
+		ret = 0;
 	}
 
-	if (ret != SL_STATUS_OK) {
+	if (ret) {
 		LOG_ERR("Failed to set credentials: 0x%x", ret);
 		wifi_mgmt_raise_connect_result_event(sidev->iface, WIFI_STATUS_CONN_FAIL);
 		return -EINVAL;