diff --git a/sb600spi.c b/sb600spi.c
index f4f3492ea2a8ab1af2080ccd9008e4d3d991abe1..4ca905becb3c526f9cb451494d9a4972e38fe9e5 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -25,18 +25,19 @@
 #include "flash.h"
 #include "spi.h"
 
-struct sb600_spi_controller {
-	unsigned int spi_cntrl0;	/* 00h */
-	unsigned int restrictedcmd1;	/* 04h */
-	unsigned int restrictedcmd2;	/* 08h */
-	unsigned int spi_cntrl1;	/* 0ch */
-	unsigned int spi_cmdvalue0;	/* 10h */
-	unsigned int spi_cmdvalue1;	/* 14h */
-	unsigned int spi_cmdvalue2;	/* 18h */
-	unsigned int spi_fakeid;	/* 1Ch */
-};
-
-struct sb600_spi_controller *spi_bar = NULL;
+/* This struct is unused, but helps visualize the SB600 SPI BAR layout.
+ *struct sb600_spi_controller {
+ *	unsigned int spi_cntrl0;	/ * 00h * /
+ *	unsigned int restrictedcmd1;	/ * 04h * /
+ *	unsigned int restrictedcmd2;	/ * 08h * /
+ *	unsigned int spi_cntrl1;	/ * 0ch * /
+ *	unsigned int spi_cmdvalue0;	/ * 10h * /
+ *	unsigned int spi_cmdvalue1;	/ * 14h * /
+ *	unsigned int spi_cmdvalue2;	/ * 18h * /
+ *	unsigned int spi_fakeid;	/ * 1Ch * /
+ *};
+ */
+
 uint8_t *sb600_spibar;
 
 int sb600_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len)
@@ -86,7 +87,7 @@ int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf)
 	return rc;
 }
 
-void reset_internal_fifo_pointer(void)
+static void reset_internal_fifo_pointer(void)
 {
 	mmio_writeb(mmio_readb(sb600_spibar + 2) | 0x10, sb600_spibar + 2);
 
@@ -94,7 +95,7 @@ void reset_internal_fifo_pointer(void)
 		printf("reset\n");
 }
 
-void execute_command(void)
+static void execute_command(void)
 {
 	mmio_writeb(mmio_readb(sb600_spibar + 2) | 1, sb600_spibar + 2);
 
@@ -111,8 +112,6 @@ int sb600_spi_command(unsigned int writecnt, unsigned int readcnt,
 
 	writecnt--;
 
-	spi_bar = (struct sb600_spi_controller *) sb600_spibar;
-
 	printf_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n",
 		     __func__, cmd, writecnt, readcnt);