1 files changed, 6 insertions, 17 deletions

diff --git a/bitbang_spi.c b/bitbang_spi.c
index b543fd4..9f0e878 100644
--- a/bitbang_spi.c
+++ b/bitbang_spi.c
@@ -29,45 +29,34 @@
 /* Length of half a clock period in usecs. */
 static int bitbang_spi_half_period;
 
-static enum bitbang_spi_master bitbang_spi_master = BITBANG_SPI_INVALID;
-
-static const struct bitbang_spi_master_entry bitbang_spi_master_table[] = {
-	{}, /* This entry corresponds to BITBANG_SPI_INVALID. */
-};
-
-const int bitbang_spi_master_count = ARRAY_SIZE(bitbang_spi_master_table);
+static const struct bitbang_spi_master *bitbang_spi_master = NULL;
 
 /* Note that CS# is active low, so val=0 means the chip is active. */
 static void bitbang_spi_set_cs(int val)
 {
-	bitbang_spi_master_table[bitbang_spi_master].set_cs(val);
+	bitbang_spi_master->set_cs(val);
 }
 
 static void bitbang_spi_set_sck(int val)
 {
-	bitbang_spi_master_table[bitbang_spi_master].set_sck(val);
+	bitbang_spi_master->set_sck(val);
 }
 
 static void bitbang_spi_set_mosi(int val)
 {
-	bitbang_spi_master_table[bitbang_spi_master].set_mosi(val);
+	bitbang_spi_master->set_mosi(val);
 }
 
 static int bitbang_spi_get_miso(void)
 {
-	return bitbang_spi_master_table[bitbang_spi_master].get_miso();
+	return bitbang_spi_master->get_miso();
 }
 
-int bitbang_spi_init(enum bitbang_spi_master master, int halfperiod)
+int bitbang_spi_init(const struct bitbang_spi_master *master, int halfperiod)
 {
 	bitbang_spi_master = master;
 	bitbang_spi_half_period = halfperiod;
 
-	if (bitbang_spi_master == BITBANG_SPI_INVALID) {
-		msg_perr("Invalid bitbang SPI master. \n"
-			 "Please report a bug at flashrom@flashrom.org\n");
-		return 1;
-	}
 	bitbang_spi_set_cs(1);
 	bitbang_spi_set_sck(0);
 	bitbang_spi_set_mosi(0);