kernel: atomics: update print specifiers for atomic_t

cfriedt · Christopher Friedt · commit c09dd0433727 · 2022-07-21T13:47:16.000-04:00
The print specifier for `atomic_t` should be updated
to `%ld`, `%lu`, or `%lx` to account for the type
change of `atomic_t` to `long`.

Signed-off-by: Christopher Friedt &lt;chrisfriedt@gmail.com&gt;
diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c
@@ -706,7 +706,7 @@ static int kw41z_tx(const struct device *dev, enum ieee802154_tx_mode mode,
 		handle_ack(kw41z, frag->data[2]);
 	}
 
-	LOG_DBG("seq_retval: %d", kw41z->seq_retval);
+	LOG_DBG("seq_retval: %ld", kw41z->seq_retval);
 	return kw41z->seq_retval;
 }
 
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
@@ -436,7 +436,7 @@ static inline bool att_chan_is_connected(struct bt_att_chan *chan)
 static int bt_att_chan_send(struct bt_att_chan *chan, struct net_buf *buf,
 			    bt_att_chan_sent_t cb)
 {
-	BT_DBG("chan %p flags %u code 0x%02x", chan, atomic_get(chan->flags),
+	BT_DBG("chan %p flags %lu code 0x%02x", chan, atomic_get(chan->flags),
 	       ((struct bt_att_hdr *)buf->data)->code);
 
 	return chan_send(chan, buf, cb);
@@ -2612,7 +2612,7 @@ static struct bt_att_chan *att_get_fixed_chan(struct bt_conn *conn)
 
 static void att_chan_attach(struct bt_att *att, struct bt_att_chan *chan)
 {
-	BT_DBG("att %p chan %p flags %u", att, chan, atomic_get(chan->flags));
+	BT_DBG("att %p chan %p flags %lu", att, chan, atomic_get(chan->flags));
 
 	if (sys_slist_is_empty(&att->chans)) {
 		/* Init general queues when attaching the first channel */
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
@@ -1077,7 +1077,7 @@ struct bt_conn *bt_conn_ref(struct bt_conn *conn)
 		}
 	} while (!atomic_cas(&conn->ref, old, old + 1));
 
-	BT_DBG("handle %u ref %d -> %d", conn->handle, old, old + 1);
+	BT_DBG("handle %u ref %ld -> %ld", conn->handle, old, old + 1);
 
 	return conn;
 }
@@ -1088,7 +1088,7 @@ void bt_conn_unref(struct bt_conn *conn)
 
 	old = atomic_dec(&conn->ref);
 
-	BT_DBG("handle %u ref %d -> %d", conn->handle, old,
+	BT_DBG("handle %u ref %ld -> %ld", conn->handle, old,
 	       atomic_get(&conn->ref));
 
 	__ASSERT(old > 0, "Conn reference counter is 0");
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
@@ -1855,7 +1855,7 @@ static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch,
 		return -EAGAIN;
 	}
 
-	BT_DBG("ch %p cid 0x%04x len %u credits %u", ch, ch->tx.cid,
+	BT_DBG("ch %p cid 0x%04x len %u credits %lu", ch, ch->tx.cid,
 	       seg->len, atomic_get(&ch->tx.credits));
 
 	len = seg->len - sdu_hdr_len;
@@ -1998,7 +1998,7 @@ static void le_credits(struct bt_l2cap *l2cap, uint8_t ident,
 
 	l2cap_chan_tx_give_credits(ch, credits);
 
-	BT_DBG("chan %p total credits %u", ch, atomic_get(&ch->tx.credits));
+	BT_DBG("chan %p total credits %lu", ch, atomic_get(&ch->tx.credits));
 
 	l2cap_chan_tx_resume(ch);
 }
@@ -2172,7 +2172,7 @@ static void l2cap_chan_send_credits(struct bt_l2cap_le_chan *chan,
 
 	l2cap_send(chan->chan.conn, BT_L2CAP_CID_LE_SIG, buf);
 
-	BT_DBG("chan %p credits %u", chan, atomic_get(&chan->rx.credits));
+	BT_DBG("chan %p credits %lu", chan, atomic_get(&chan->rx.credits));
 }
 
 static void l2cap_chan_update_credits(struct bt_l2cap_le_chan *chan,
diff --git a/subsys/bluetooth/services/ots/ots_l2cap.c b/subsys/bluetooth/services/ots/ots_l2cap.c
@@ -122,7 +122,7 @@ static int l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 
 static void l2cap_status(struct bt_l2cap_chan *chan, atomic_t *status)
 {
-	LOG_DBG("Channel %p status %u", chan, *status);
+	LOG_DBG("Channel %p status %lu", chan, atomic_get(status));
 }
 
 static void l2cap_connected(struct bt_l2cap_chan *chan)
diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c
@@ -538,7 +538,7 @@ void net_pkt_unref(struct net_pkt *pkt)
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 #if CONFIG_NET_PKT_LOG_LEVEL >= LOG_LEVEL_DBG
-	NET_DBG("%s [%d] pkt %p ref %d frags %p (%s():%d)",
+	NET_DBG("%s [%d] pkt %p ref %ld frags %p (%s():%d)",
 		slab2str(pkt->slab), k_mem_slab_num_free_get(pkt->slab),
 		pkt, ref - 1, pkt->frags, caller, line);
 #endif
@@ -619,7 +619,7 @@ struct net_pkt *net_pkt_ref(struct net_pkt *pkt)
 	} while (!atomic_cas(&pkt->atomic_ref, ref, ref + 1));
 
 #if CONFIG_NET_PKT_LOG_LEVEL >= LOG_LEVEL_DBG
-	NET_DBG("%s [%d] pkt %p ref %d (%s():%d)",
+	NET_DBG("%s [%d] pkt %p ref %ld (%s():%d)",
 		slab2str(pkt->slab), k_mem_slab_num_free_get(pkt->slab),
 		pkt, ref + 1, caller, line);
 #endif
diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h
@@ -248,14 +248,14 @@ static inline void net_pkt_print_buffer_info(struct net_pkt *pkt, const char *st
 		printk("%s", str);
 	}
 
-	printk("%p[%d]", pkt, atomic_get(&pkt->atomic_ref));
+	printk("%p[%ld]", pkt, atomic_get(&pkt->atomic_ref));
 
 	if (buf) {
 		printk("->");
 	}
 
 	while (buf) {
-		printk("%p[%d/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
+		printk("%p[%ld/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
 		       buf->len, net_buf_max_len(buf), buf->size);
 
 		buf = buf->frags;
diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c
@@ -1496,7 +1496,7 @@ static void tcp_sent_list_cb(struct tcp *conn, void *user_data)
 			details->printed_details = true;
 		}
 
-		PR("%p   %d    %u\t %u\t  %zd\t  %d\t  %d/%d/%d %s\n",
+		PR("%p   %ld    %u\t %u\t  %zd\t  %d\t  %d/%d/%d %s\n",
 		   conn, atomic_get(&conn->ref_count), conn->recv_win,
 		   conn->send_win, conn->send_data_total, conn->unacked_len,
 		   conn->in_retransmission, conn->in_connect, conn->in_close,
@@ -1524,12 +1524,12 @@ static void tcp_sent_list_cb(struct tcp *conn, void *user_data)
 			struct net_buf *frag = pkt->frags;
 
 			if (!details->printed_send_queue_header) {
-				PR("%p[%d/%zd]", pkt,
+				PR("%p[%ld/%zd]", pkt,
 				   atomic_get(&pkt->atomic_ref),
 				   net_pkt_get_len(pkt));
 				details->printed_send_queue_header = true;
 			} else {
-				PR("                %p[%d/%zd]",
+				PR("                %p[%ld/%zd]",
 				   pkt, atomic_get(&pkt->atomic_ref),
 				   net_pkt_get_len(pkt));
 			}
@@ -1630,7 +1630,7 @@ static void allocs_cb(struct net_pkt *pkt,
 
 	if (func_alloc) {
 		if (in_use) {
-			PR("%p/%d\t%5s\t%5s\t%s():%d\n",
+			PR("%p/%ld\t%5s\t%5s\t%s():%d\n",
 			   pkt, atomic_get(&pkt->atomic_ref), str,
 			   net_pkt_slab2str(pkt->slab),
 			   func_alloc, line_alloc);
@@ -3632,8 +3632,7 @@ static void context_info(struct net_context *context, void *user_data)
 		}
 
 #if defined(CONFIG_NET_BUF_POOL_USAGE)
-		PR("%p\t%d\t%d\tEDATA (%s)\n",
-		   pool, pool->buf_count,
+		PR("%p\t%d\t%ld\tEDATA (%s)\n", pool, pool->buf_count,
 		   atomic_get(&pool->avail_count), pool->name);
 #else
 		PR("%p\t%d\tEDATA\n", pool, pool->buf_count);
@@ -3671,13 +3670,11 @@ static int cmd_net_mem(const struct shell *shell, size_t argc, char *argv[])
 	PR("%p\t%d\t%u\tTX\n",
 	       tx, tx->num_blocks, k_mem_slab_num_free_get(tx));
 
-	PR("%p\t%d\t%d\tRX DATA (%s)\n",
-	       rx_data, rx_data->buf_count,
-	       atomic_get(&rx_data->avail_count), rx_data->name);
+	PR("%p\t%d\t%ld\tRX DATA (%s)\n	", rx_data, rx_data->buf_count,
+	   atomic_get(&rx_data->avail_count), rx_data->name);
 
-	PR("%p\t%d\t%d\tTX DATA (%s)\n",
-	       tx_data, tx_data->buf_count,
-	       atomic_get(&tx_data->avail_count), tx_data->name);
+	PR("%p\t%d\t%ld\tTX DATA (%s)\n", tx_data, tx_data->buf_count,
+	   atomic_get(&tx_data->avail_count), tx_data->name);
 #else
 	PR("Address\t\tTotal\tName\n");
 
@@ -4242,14 +4239,14 @@ static void net_pkt_buffer_info(const struct shell *shell, struct net_pkt *pkt)
 	struct net_buf *buf = pkt->buffer;
 
 	PR("net_pkt %p buffer chain:\n", pkt);
-	PR("%p[%d]", pkt, atomic_get(&pkt->atomic_ref));
+	PR("%p[%ld]", pkt, atomic_get(&pkt->atomic_ref));
 
 	if (buf) {
 		PR("->");
 	}
 
 	while (buf) {
-		PR("%p[%d/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
+		PR("%p[%ld/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
 		   buf->len, net_buf_max_len(buf), buf->size);
 
 		buf = buf->frags;
diff --git a/subsys/net/l2/ethernet/arp.c b/subsys/net/l2/ethernet/arp.c
@@ -37,7 +37,7 @@ static void arp_entry_cleanup(struct arp_entry *entry, bool pending)
 	NET_DBG("%p", entry);
 
 	if (pending) {
-		NET_DBG("Releasing pending pkt %p (ref %d)",
+		NET_DBG("Releasing pending pkt %p (ref %ld)",
 			entry->pending,
 			atomic_get(&entry->pending->atomic_ref) - 1);
 		net_pkt_unref(entry->pending);
diff --git a/subsys/shell/shell_cmds.c b/subsys/shell/shell_cmds.c
@@ -314,7 +314,7 @@ static int cmd_shell_stats_show(const struct shell *shell, size_t argc,
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
 
-	shell_print(shell, "Lost logs: %u", shell->stats->log_lost_cnt);
+	shell_print(shell, "Lost logs: %lu", shell->stats->log_lost_cnt);
 
 	return 0;
 }
diff --git a/subsys/usb/class/netusb/function_rndis.c b/subsys/usb/class/netusb/function_rndis.c
@@ -457,7 +457,7 @@ static void rndis_notify_rsp(void)
 	};
 	int ret;
 
-	LOG_DBG("count %u", atomic_get(&rndis.notify_count));
+	LOG_DBG("count %lu", atomic_get(&rndis.notify_count));
 
 	if (atomic_get(&rndis.notify_count)) {
 		LOG_WRN("Notification is already sent");
diff --git a/tests/net/socket/socketpair/src/test_socketpair_block.c b/tests/net/socket/socketpair/src/test_socketpair_block.c
@@ -44,7 +44,7 @@ static void work_handler(struct k_work *work)
 
 	while (true) {
 		if (ctx.write) {
-			LOG_DBG("ctx.m: %u", ctx.m);
+			LOG_DBG("ctx.m: %lu", atomic_get(&ctx.m));
 			if (atomic_get(&ctx.m)
 				< CONFIG_NET_SOCKETPAIR_BUFFER_SIZE) {
 				continue;
@@ -106,7 +106,7 @@ void test_socketpair_write_block(void)
 				res);
 
 			atomic_inc(&ctx.m);
-			LOG_DBG("have written %u bytes", ctx.m);
+			LOG_DBG("have written %lu bytes", atomic_get(&ctx.m));
 		}
 
 		/* try to write one more byte */

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ static int kw41z_tx(const struct device *dev, enum ieee802154_tx_mode mode,`
`706`	`706`	`handle_ack(kw41z, frag->data[2]);`
`707`	`707`	`}`
`708`	`708`
`709`		`- LOG_DBG("seq_retval: %d", kw41z->seq_retval);`
	`709`	`+ LOG_DBG("seq_retval: %ld", kw41z->seq_retval);`
`710`	`710`	`return kw41z->seq_retval;`
`711`	`711`	`}`
`712`	`712`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ static inline bool att_chan_is_connected(struct bt_att_chan *chan)`
`436`	`436`	`static int bt_att_chan_send(struct bt_att_chan chan, struct net_buf buf,`
`437`	`437`	`bt_att_chan_sent_t cb)`
`438`	`438`	`{`
`439`		`- BT_DBG("chan %p flags %u code 0x%02x", chan, atomic_get(chan->flags),`
	`439`	`+ BT_DBG("chan %p flags %lu code 0x%02x", chan, atomic_get(chan->flags),`
`440`	`440`	`((struct bt_att_hdr *)buf->data)->code);`
`441`	`441`
`442`	`442`	`return chan_send(chan, buf, cb);`
`@@ -2612,7 +2612,7 @@ static struct bt_att_chan att_get_fixed_chan(struct bt_conn conn)`
`2612`	`2612`
`2613`	`2613`	`static void att_chan_attach(struct bt_att att, struct bt_att_chan chan)`
`2614`	`2614`	`{`
`2615`		`- BT_DBG("att %p chan %p flags %u", att, chan, atomic_get(chan->flags));`
	`2615`	`+ BT_DBG("att %p chan %p flags %lu", att, chan, atomic_get(chan->flags));`
`2616`	`2616`
`2617`	`2617`	`if (sys_slist_is_empty(&att->chans)) {`
`2618`	`2618`	`/* Init general queues when attaching the first channel */`
Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ struct bt_conn bt_conn_ref(struct bt_conn conn)`
`1077`	`1077`	`}`
`1078`	`1078`	`} while (!atomic_cas(&conn->ref, old, old + 1));`
`1079`	`1079`
`1080`		`- BT_DBG("handle %u ref %d -> %d", conn->handle, old, old + 1);`
	`1080`	`+ BT_DBG("handle %u ref %ld -> %ld", conn->handle, old, old + 1);`
`1081`	`1081`
`1082`	`1082`	`return conn;`
`1083`	`1083`	`}`
`@@ -1088,7 +1088,7 @@ void bt_conn_unref(struct bt_conn *conn)`
`1088`	`1088`
`1089`	`1089`	`old = atomic_dec(&conn->ref);`
`1090`	`1090`
`1091`		`- BT_DBG("handle %u ref %d -> %d", conn->handle, old,`
	`1091`	`+ BT_DBG("handle %u ref %ld -> %ld", conn->handle, old,`
`1092`	`1092`	`atomic_get(&conn->ref));`
`1093`	`1093`
`1094`	`1094`	`__ASSERT(old > 0, "Conn reference counter is 0");`
Original file line number	Diff line number	Diff line change
`@@ -1855,7 +1855,7 @@ static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch,`
`1855`	`1855`	`return -EAGAIN;`
`1856`	`1856`	`}`
`1857`	`1857`
`1858`		`- BT_DBG("ch %p cid 0x%04x len %u credits %u", ch, ch->tx.cid,`
	`1858`	`+ BT_DBG("ch %p cid 0x%04x len %u credits %lu", ch, ch->tx.cid,`
`1859`	`1859`	`seg->len, atomic_get(&ch->tx.credits));`
`1860`	`1860`
`1861`	`1861`	`len = seg->len - sdu_hdr_len;`
`@@ -1998,7 +1998,7 @@ static void le_credits(struct bt_l2cap *l2cap, uint8_t ident,`
`1998`	`1998`
`1999`	`1999`	`l2cap_chan_tx_give_credits(ch, credits);`
`2000`	`2000`
`2001`		`- BT_DBG("chan %p total credits %u", ch, atomic_get(&ch->tx.credits));`
	`2001`	`+ BT_DBG("chan %p total credits %lu", ch, atomic_get(&ch->tx.credits));`
`2002`	`2002`
`2003`	`2003`	`l2cap_chan_tx_resume(ch);`
`2004`	`2004`	`}`
`@@ -2172,7 +2172,7 @@ static void l2cap_chan_send_credits(struct bt_l2cap_le_chan *chan,`
`2172`	`2172`
`2173`	`2173`	`l2cap_send(chan->chan.conn, BT_L2CAP_CID_LE_SIG, buf);`
`2174`	`2174`
`2175`		`- BT_DBG("chan %p credits %u", chan, atomic_get(&chan->rx.credits));`
	`2175`	`+ BT_DBG("chan %p credits %lu", chan, atomic_get(&chan->rx.credits));`
`2176`	`2176`	`}`
`2177`	`2177`
`2178`	`2178`	`static void l2cap_chan_update_credits(struct bt_l2cap_le_chan *chan,`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ static int l2cap_recv(struct bt_l2cap_chan chan, struct net_buf buf)`
`122`	`122`
`123`	`123`	`static void l2cap_status(struct bt_l2cap_chan chan, atomic_t status)`
`124`	`124`	`{`
`125`		`- LOG_DBG("Channel %p status %u", chan, *status);`
	`125`	`+ LOG_DBG("Channel %p status %lu", chan, atomic_get(status));`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`static void l2cap_connected(struct bt_l2cap_chan *chan)`
Original file line number	Diff line number	Diff line change
`@@ -248,14 +248,14 @@ static inline void net_pkt_print_buffer_info(struct net_pkt pkt, const char st`
`248`	`248`	`printk("%s", str);`
`249`	`249`	`}`
`250`	`250`
`251`		`- printk("%p[%d]", pkt, atomic_get(&pkt->atomic_ref));`
	`251`	`+ printk("%p[%ld]", pkt, atomic_get(&pkt->atomic_ref));`
`252`	`252`
`253`	`253`	`if (buf) {`
`254`	`254`	`printk("->");`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`while (buf) {`
`258`		`- printk("%p[%d/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),`
	`258`	`+ printk("%p[%ld/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),`
`259`	`259`	`buf->len, net_buf_max_len(buf), buf->size);`
`260`	`260`
`261`	`261`	`buf = buf->frags;`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ static int cmd_shell_stats_show(const struct shell *shell, size_t argc,`
`314`	`314`	`ARG_UNUSED(argc);`
`315`	`315`	`ARG_UNUSED(argv);`
`316`	`316`
`317`		`- shell_print(shell, "Lost logs: %u", shell->stats->log_lost_cnt);`
	`317`	`+ shell_print(shell, "Lost logs: %lu", shell->stats->log_lost_cnt);`
`318`	`318`
`319`	`319`	`return 0;`
`320`	`320`	`}`