modem: renames shadow variables

Renames shadow variables found by -Wshadow.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>

Author: dcpleung

drivers/modem/gsm_ppp.c

@@ -117,7 +117,7 @@ static struct gsm_modem {
 	gsm_modem_power_cb modem_on_cb;
 	gsm_modem_power_cb modem_off_cb;
 	struct net_mgmt_event_callback gsm_mgmt_cb;
-} gsm;
+} modem;
 
 NET_BUF_POOL_DEFINE(gsm_recv_pool, GSM_RECV_MAX_BUF, GSM_RECV_BUF_SIZE, 0, NULL);
 K_KERNEL_STACK_DEFINE(gsm_rx_stack, CONFIG_MODEM_GSM_RX_STACK_SIZE);
@@ -135,7 +135,7 @@ static inline void gsm_ppp_unlock(struct gsm_modem *gsm)
 
 static inline int gsm_work_reschedule(struct k_work_delayable *dwork, k_timeout_t delay)
 {
-	return k_work_reschedule_for_queue(&gsm.workq, dwork, delay);
+	return k_work_reschedule_for_queue(&modem.workq, dwork, delay);
 }
 
 #if defined(CONFIG_MODEM_GSM_ENABLE_CESQ_RSSI)
@@ -185,15 +185,15 @@ MODEM_CMD_DEFINE(gsm_cmd_ok)
 {
 	(void)modem_cmd_handler_set_error(data, 0);
 	LOG_DBG("ok");
-	k_sem_give(&gsm.sem_response);
+	k_sem_give(&modem.sem_response);
 	return 0;
 }
 
 MODEM_CMD_DEFINE(gsm_cmd_error)
 {
 	(void)modem_cmd_handler_set_error(data, -EINVAL);
 	LOG_DBG("error");
-	k_sem_give(&gsm.sem_response);
+	k_sem_give(&modem.sem_response);
 	return 0;
 }
 
@@ -202,7 +202,7 @@ MODEM_CMD_DEFINE(gsm_cmd_exterror)
 {
 	/* TODO: map extended error codes to values */
 	(void)modem_cmd_handler_set_error(data, -EIO);
-	k_sem_give(&gsm.sem_response);
+	k_sem_give(&modem.sem_response);
 	return 0;
 }
 
@@ -230,15 +230,15 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_cops)
 	if (argc >= 1) {
 #if defined(CONFIG_MODEM_CELL_INFO)
 		if (argc >= 3) {
-			gsm.context.data_operator = unquoted_atoi(argv[2], 10);
+			modem.context.data_operator = unquoted_atoi(argv[2], 10);
 			LOG_INF("operator: %u",
-				gsm.context.data_operator);
+				modem.context.data_operator);
 		}
 #endif
 		if (unquoted_atoi(argv[0], 10) == 0) {
-			gsm.context.is_automatic_oper = true;
+			modem.context.is_automatic_oper = true;
 		} else {
-			gsm.context.is_automatic_oper = false;
+			modem.context.is_automatic_oper = false;
 		}
 	}
 
@@ -255,11 +255,11 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_manufacturer)
 {
 	size_t out_len;
 
-	out_len = net_buf_linearize(gsm.minfo.mdm_manufacturer,
-				    sizeof(gsm.minfo.mdm_manufacturer) - 1,
+	out_len = net_buf_linearize(modem.minfo.mdm_manufacturer,
+				    sizeof(modem.minfo.mdm_manufacturer) - 1,
 				    data->rx_buf, 0, len);
-	gsm.minfo.mdm_manufacturer[out_len] = '\0';
-	LOG_INF("Manufacturer: %s", gsm.minfo.mdm_manufacturer);
+	modem.minfo.mdm_manufacturer[out_len] = '\0';
+	LOG_INF("Manufacturer: %s", modem.minfo.mdm_manufacturer);
 
 	return 0;
 }
@@ -269,11 +269,11 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_model)
 {
 	size_t out_len;
 
-	out_len = net_buf_linearize(gsm.minfo.mdm_model,
-				    sizeof(gsm.minfo.mdm_model) - 1,
+	out_len = net_buf_linearize(modem.minfo.mdm_model,
+				    sizeof(modem.minfo.mdm_model) - 1,
 				    data->rx_buf, 0, len);
-	gsm.minfo.mdm_model[out_len] = '\0';
-	LOG_INF("Model: %s", gsm.minfo.mdm_model);
+	modem.minfo.mdm_model[out_len] = '\0';
+	LOG_INF("Model: %s", modem.minfo.mdm_model);
 
 	return 0;
 }
@@ -283,11 +283,11 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_revision)
 {
 	size_t out_len;
 
-	out_len = net_buf_linearize(gsm.minfo.mdm_revision,
-				    sizeof(gsm.minfo.mdm_revision) - 1,
+	out_len = net_buf_linearize(modem.minfo.mdm_revision,
+				    sizeof(modem.minfo.mdm_revision) - 1,
 				    data->rx_buf, 0, len);
-	gsm.minfo.mdm_revision[out_len] = '\0';
-	LOG_INF("Revision: %s", gsm.minfo.mdm_revision);
+	modem.minfo.mdm_revision[out_len] = '\0';
+	LOG_INF("Revision: %s", modem.minfo.mdm_revision);
 
 	return 0;
 }
@@ -297,10 +297,10 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_imei)
 {
 	size_t out_len;
 
-	out_len = net_buf_linearize(gsm.minfo.mdm_imei, sizeof(gsm.minfo.mdm_imei) - 1,
+	out_len = net_buf_linearize(modem.minfo.mdm_imei, sizeof(modem.minfo.mdm_imei) - 1,
 				    data->rx_buf, 0, len);
-	gsm.minfo.mdm_imei[out_len] = '\0';
-	LOG_INF("IMEI: %s", gsm.minfo.mdm_imei);
+	modem.minfo.mdm_imei[out_len] = '\0';
+	LOG_INF("IMEI: %s", modem.minfo.mdm_imei);
 
 	return 0;
 }
@@ -311,10 +311,10 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_imsi)
 {
 	size_t out_len;
 
-	out_len = net_buf_linearize(gsm.minfo.mdm_imsi, sizeof(gsm.minfo.mdm_imsi) - 1,
+	out_len = net_buf_linearize(modem.minfo.mdm_imsi, sizeof(modem.minfo.mdm_imsi) - 1,
 				    data->rx_buf, 0, len);
-	gsm.minfo.mdm_imsi[out_len] = '\0';
-	LOG_INF("IMSI: %s", gsm.minfo.mdm_imsi);
+	modem.minfo.mdm_imsi[out_len] = '\0';
+	LOG_INF("IMSI: %s", modem.minfo.mdm_imsi);
 
 	return 0;
 }
@@ -324,32 +324,32 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_iccid)
 {
 	size_t out_len;
 
-	out_len = net_buf_linearize(gsm.minfo.mdm_iccid, sizeof(gsm.minfo.mdm_iccid) - 1,
+	out_len = net_buf_linearize(modem.minfo.mdm_iccid, sizeof(modem.minfo.mdm_iccid) - 1,
 				    data->rx_buf, 0, len);
-	gsm.minfo.mdm_iccid[out_len] = '\0';
-	if (gsm.minfo.mdm_iccid[0] == '+') {
+	modem.minfo.mdm_iccid[out_len] = '\0';
+	if (modem.minfo.mdm_iccid[0] == '+') {
 		/* Seen on U-blox SARA: "+CCID: nnnnnnnnnnnnnnnnnnnn".
 		 * Skip over the +CCID bit, which other modems omit.
 		 */
-		char *p = strchr(gsm.minfo.mdm_iccid, ' ');
+		char *p = strchr(modem.minfo.mdm_iccid, ' ');
 
 		if (p) {
-			size_t len = strlen(p+1);
+			size_t iccid_len = strlen(p+1);
 
-			(void)memmove(gsm.minfo.mdm_iccid, p+1, len+1);
+			(void)memmove(modem.minfo.mdm_iccid, p+1, iccid_len+1);
 		}
 	}
-	LOG_INF("ICCID: %s", gsm.minfo.mdm_iccid);
+	LOG_INF("ICCID: %s", modem.minfo.mdm_iccid);
 
 	return 0;
 }
 #endif /* CONFIG_MODEM_SIM_NUMBERS */
 
 MODEM_CMD_DEFINE(on_cmd_net_reg_sts)
 {
-	gsm.net_state = (enum network_state)atoi(argv[1]);
+	modem.net_state = (enum network_state)atoi(argv[1]);
 
-	switch (gsm.net_state) {
+	switch (modem.net_state) {
 	case GSM_NET_NOT_REGISTERED:
 		LOG_DBG("Network %s.", "not registered");
 		break;
@@ -383,16 +383,16 @@ MODEM_CMD_DEFINE(on_cmd_net_reg_sts)
 MODEM_CMD_DEFINE(on_cmd_atcmdinfo_cereg)
 {
 	if (argc >= 4) {
-		gsm.context.data_lac = unquoted_atoi(argv[2], 16);
-		gsm.context.data_cellid = unquoted_atoi(argv[3], 16);
+		modem.context.data_lac = unquoted_atoi(argv[2], 16);
+		modem.context.data_cellid = unquoted_atoi(argv[3], 16);
 		LOG_INF("lac: %u, cellid: %u",
-			gsm.context.data_lac,
-			gsm.context.data_cellid);
+			modem.context.data_lac,
+			modem.context.data_cellid);
 	}
 
 	if (argc >= 5) {
-		gsm.context.data_act = unquoted_atoi(argv[4], 10);
-		LOG_INF("act: %u", gsm.context.data_act);
+		modem.context.data_act = unquoted_atoi(argv[4], 10);
+		LOG_INF("act: %u", modem.context.data_act);
 	}
 
 	return 0;
@@ -436,16 +436,16 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_rssi_cesq)
 	rxlev = ATOI(argv[0], 0, "rxlev");
 
 	if ((rsrp >= 0) && (rsrp <= 97)) {
-		gsm.minfo.mdm_rssi = -140 + (rsrp - 1);
-		LOG_DBG("RSRP: %d", gsm.minfo.mdm_rssi);
+		modem.minfo.mdm_rssi = -140 + (rsrp - 1);
+		LOG_DBG("RSRP: %d", modem.minfo.mdm_rssi);
 	} else if ((rscp >= 0) && (rscp <= 96)) {
-		gsm.minfo.mdm_rssi = -120 + (rscp - 1);
-		LOG_DBG("RSCP: %d", gsm.minfo.mdm_rssi);
+		modem.minfo.mdm_rssi = -120 + (rscp - 1);
+		LOG_DBG("RSCP: %d", modem.minfo.mdm_rssi);
 	} else if ((rxlev >= 0) && (rxlev <= 63)) {
-		gsm.minfo.mdm_rssi = -110 + (rxlev - 1);
-		LOG_DBG("RSSI: %d", gsm.minfo.mdm_rssi);
+		modem.minfo.mdm_rssi = -110 + (rxlev - 1);
+		LOG_DBG("RSSI: %d", modem.minfo.mdm_rssi);
 	} else {
-		gsm.minfo.mdm_rssi = GSM_RSSI_INVALID;
+		modem.minfo.mdm_rssi = GSM_RSSI_INVALID;
 		LOG_DBG("RSRP/RSCP/RSSI not known");
 	}
 
@@ -465,7 +465,7 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_rssi_csq)
 			rssi = GSM_RSSI_INVALID;
 		}
 
-		gsm.minfo.mdm_rssi = rssi;
+		modem.minfo.mdm_rssi = rssi;
 		LOG_DBG("RSSI: %d", rssi);
 	}
 
@@ -1248,14 +1248,14 @@ static void gsm_mgmt_event_handler(struct net_mgmt_event_callback *cb,
 	}
 
 	/* Right now we only support 1 GSM instance */
-	if (iface != gsm.iface) {
+	if (iface != modem.iface) {
 		return;
 	}
 
 	if (mgmt_event == NET_EVENT_IF_DOWN) {
 		LOG_INF("GSM network interface down");
 		/* raise semaphore to indicate the interface is down */
-		k_sem_give(&gsm.sem_if_down);
+		k_sem_give(&modem.sem_if_down);
 		return;
 	}
 }
@@ -1368,5 +1368,5 @@ static int gsm_init(const struct device *dev)
 	return 0;
 }
 
-DEVICE_DT_DEFINE(DT_DRV_INST(0), gsm_init, NULL, &gsm, NULL,
+DEVICE_DT_DEFINE(DT_DRV_INST(0), gsm_init, NULL, &modem, NULL,
 		 POST_KERNEL, CONFIG_MODEM_GSM_INIT_PRIORITY, NULL);