diff --git a/drivers/spi/qca_qup_spi.c b/drivers/spi/qca_qup_spi.c
index b95a4c65eb..8981f9933a 100644
--- a/drivers/spi/qca_qup_spi.c
+++ b/drivers/spi/qca_qup_spi.c
@@ -162,6 +162,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 		return NULL;
 	}
 
+	memset(ds, 0, sizeof(struct ipq_spi_slave));
+
 	/*
 	 * QCA BLSP supports SPI Flash
 	 * on different BLSP0 and BLSP1
@@ -176,13 +178,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 	}
 	ds->slave.bus	= bus;
 	ds->slave.cs	= cs;
-
-	ds->slave.memory_map = NULL;
-	ds->slave.option = 0;
-	ds->slave.max_write_size = 0;
-	ds->slave.op_mode_rx = 0;
-	ds->slave.op_mode_tx = 0;
-
 	ds->regs	= &spi_reg[bus];
 
 	/* TODO For different clock frequency */
diff --git a/drivers/spi/qca_qup_spi_bam.c b/drivers/spi/qca_qup_spi_bam.c
index 75628c9543..3d695d8ef9 100644
--- a/drivers/spi/qca_qup_spi_bam.c
+++ b/drivers/spi/qca_qup_spi_bam.c
@@ -255,6 +255,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 		return NULL;
 	}
 
+	memset(ds, 0, sizeof(struct ipq_spi_slave));
 	/*
 	 * QCA BLSP supports SPI Flash
 	 * on different BLSP0 and BLSP1