Skip to content

Commit a89dc21

Browse files
jerome-pouillerdanieldegrasse
authored andcommitted
drivers: wifi: siwx91x: Uniformize declaration of 'interface'
sl_wifi_interface_t interface is always initialized with sl_wifi_get_default_interface(). Let's assign the value during the declaration everywhere. Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
1 parent 56fb22f commit a89dc21

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

drivers/wifi/siwx91x/siwx91x_wifi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ static int siwx91x_mode(const struct device *dev, struct wifi_mode_info *mode)
215215

216216
static int siwx91x_send(const struct device *dev, struct net_pkt *pkt)
217217
{
218+
sl_wifi_interface_t interface = sl_wifi_get_default_interface();
218219
size_t pkt_len = net_pkt_get_len(pkt);
219-
sl_wifi_interface_t interface;
220220
struct net_buf *buf = NULL;
221221
int ret;
222222

@@ -233,7 +233,6 @@ static int siwx91x_send(const struct device *dev, struct net_pkt *pkt)
233233
return -ENOBUFS;
234234
}
235235
net_buf_add(buf, pkt_len);
236-
interface = sl_wifi_get_default_interface();
237236
ret = sl_wifi_send_raw_data_frame(FIELD_GET(SIWX91X_INTERFACE_MASK, interface),
238237
buf->data, pkt_len);
239238
if (ret) {

drivers/wifi/siwx91x/siwx91x_wifi_ps.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ enum {
1818

1919
static int siwx91x_get_connected_ap_beacon_interval_ms(void)
2020
{
21+
sl_wifi_interface_t interface = sl_wifi_get_default_interface();
2122
sl_wifi_operational_statistics_t sl_stat;
22-
sl_wifi_interface_t interface;
2323
int ret;
2424

25-
interface = sl_wifi_get_default_interface();
2625
if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) != SL_WIFI_CLIENT_INTERFACE) {
2726
return 0;
2827
}
@@ -37,12 +36,11 @@ static int siwx91x_get_connected_ap_beacon_interval_ms(void)
3736

3837
int siwx91x_apply_power_save(struct siwx91x_dev *sidev)
3938
{
39+
sl_wifi_interface_t interface = sl_wifi_get_default_interface();
4040
sl_wifi_performance_profile_t sl_ps_profile;
41-
sl_wifi_interface_t interface;
4241
int beacon_interval;
4342
int ret;
4443

45-
interface = sl_wifi_get_default_interface();
4644
if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) != SL_WIFI_CLIENT_INTERFACE) {
4745
LOG_ERR("Wi-Fi not in station mode");
4846
return -EINVAL;
@@ -153,15 +151,14 @@ int siwx91x_set_power_save(const struct device *dev, struct wifi_ps_params *para
153151

154152
int siwx91x_get_power_save_config(const struct device *dev, struct wifi_ps_config *config)
155153
{
154+
sl_wifi_interface_t interface = sl_wifi_get_default_interface();
156155
sl_wifi_performance_profile_t sl_ps_profile;
157156
struct siwx91x_dev *sidev = dev->data;
158-
sl_wifi_interface_t interface;
159157
uint16_t beacon_interval;
160158
int ret;
161159

162160
__ASSERT(config, "config cannot be NULL");
163161

164-
interface = sl_wifi_get_default_interface();
165162
if (FIELD_GET(SIWX91X_INTERFACE_MASK, interface) != SL_WIFI_CLIENT_INTERFACE) {
166163
LOG_ERR("Wi-Fi not in station mode");
167164
return -EINVAL;

0 commit comments

Comments
 (0)