Index: uspace/drv/audio/sb16/dsp.c
===================================================================
--- uspace/drv/audio/sb16/dsp.c	(revision 03362fbdd97fb8df65b78ada498e07140aaa9080)
+++ uspace/drv/audio/sb16/dsp.c	(revision faf83cf9ad0f66d170fa21d6bd2f1a5ba5abe52d)
@@ -40,4 +40,5 @@
 #include <libarch/ddi.h>
 #include <libarch/barrier.h>
+#include <macros.h>
 #include <str_error.h>
 #include <audio_pcm_iface.h>
@@ -74,5 +75,5 @@
 		[DSP_NO_BUFFER] = "NO BUFFER",
 	};
-	if (state < (sizeof(state_names) / sizeof(state_names[0])))
+	if (state < ARRAY_SIZE(state_names))
 		return state_names[state];
 	return "UNKNOWN";
Index: uspace/drv/audio/sb16/mixer.c
===================================================================
--- uspace/drv/audio/sb16/mixer.c	(revision 03362fbdd97fb8df65b78ada498e07140aaa9080)
+++ uspace/drv/audio/sb16/mixer.c	(revision faf83cf9ad0f66d170fa21d6bd2f1a5ba5abe52d)
@@ -31,4 +31,5 @@
 #include <errno.h>
 #include <libarch/ddi.h>
+#include <macros.h>
 #include <unistd.h>
 
@@ -128,20 +129,18 @@
 
 static const struct {
+	const volume_item_t *table;
 	size_t count;
-	const volume_item_t *table;
 } volume_table[] = {
-	[SB_MIXER_NONE] = { 0, NULL },
-	[SB_MIXER_UNKNOWN] = { 0, NULL },
-	[SB_MIXER_CT1335] = {
-	    sizeof(volume_ct1335) / sizeof(volume_item_t), volume_ct1335 },
-	[SB_MIXER_CT1345] = {
-	    sizeof(volume_ct1345) / sizeof(volume_item_t), volume_ct1345 },
-	[SB_MIXER_CT1745] = {
-	    sizeof(volume_ct1745) / sizeof(volume_item_t), volume_ct1745 },
+	[SB_MIXER_NONE] = { NULL, 0 },
+	[SB_MIXER_UNKNOWN] = { NULL, 0 },
+	[SB_MIXER_CT1335] = { volume_ct1335, ARRAY_SIZE(volume_ct1335) },
+	[SB_MIXER_CT1345] = { volume_ct1345, ARRAY_SIZE(volume_ct1345) },
+	[SB_MIXER_CT1745] = { volume_ct1745, ARRAY_SIZE(volume_ct1745) },
 };
 
 const char * sb_mixer_type_str(sb_mixer_type_t type)
 {
-	static const char * names[] = {
+	static const char *names[] = {
+		[SB_MIXER_NONE] = "No mixer",
 		[SB_MIXER_CT1335] = "CT 1335",
 		[SB_MIXER_CT1345] = "CT 1345",
Index: uspace/drv/audio/sb16/sb16.c
===================================================================
--- uspace/drv/audio/sb16/sb16.c	(revision 03362fbdd97fb8df65b78ada498e07140aaa9080)
+++ uspace/drv/audio/sb16/sb16.c	(revision faf83cf9ad0f66d170fa21d6bd2f1a5ba5abe52d)
@@ -31,4 +31,5 @@
 #include <errno.h>
 #include <str_error.h>
+#include <macros.h>
 #include <audio_mixer_iface.h>
 #include <audio_pcm_iface.h>
@@ -73,5 +74,5 @@
 size_t sb16_irq_code_size(void)
 {
-	return sizeof(irq_cmds) / sizeof(irq_cmds[0]);
+	return ARRAY_SIZE(irq_cmds);
 }