2 files changed, 19 insertions, 6 deletions

diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 8ebd724e4c59..429e11190265 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -452,16 +452,16 @@ static int fsl_espi_setup(struct spi_device *spi)
         int retval;
         u32 hw_mode;
         u32 loop_mode;
-        struct spi_mpc8xxx_cs *cs = spi->controller_state;
+        struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);
 
         if (!spi->max_speed_hz)
                 return -EINVAL;
 
         if (!cs) {
-                cs = devm_kzalloc(&spi->dev, sizeof(*cs), GFP_KERNEL);
+                cs = kzalloc(sizeof(*cs), GFP_KERNEL);
                 if (!cs)
                         return -ENOMEM;
-                spi->controller_state = cs;
+                spi_set_ctldata(spi, cs);
         }
 
         mpc8xxx_spi = spi_master_get_devdata(spi->master);
@@ -496,6 +496,14 @@ static int fsl_espi_setup(struct spi_device *spi)
         return 0;
 }
 
+static void fsl_espi_cleanup(struct spi_device *spi)
+{
+        struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);
+
+        kfree(cs);
+        spi_set_ctldata(spi, NULL);
+}
+
 void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)
 {
         struct fsl_espi_reg *reg_base = mspi->reg_base;
@@ -605,6 +613,7 @@ static struct spi_master * fsl_espi_probe(struct device *dev,
 
         master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 16);
         master->setup = fsl_espi_setup;
+        master->cleanup = fsl_espi_cleanup;
 
         mpc8xxx_spi = spi_master_get_devdata(master);
         mpc8xxx_spi->spi_do_one_msg = fsl_espi_do_one_msg;
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 9452f6740997..590f31bc0aba 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -425,16 +425,16 @@ static int fsl_spi_setup(struct spi_device *spi)
         struct fsl_spi_reg *reg_base;
         int retval;
         u32 hw_mode;
-        struct spi_mpc8xxx_cs   *cs = spi->controller_state;
+        struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);
 
         if (!spi->max_speed_hz)
                 return -EINVAL;
 
         if (!cs) {
-                cs = devm_kzalloc(&spi->dev, sizeof(*cs), GFP_KERNEL);
+                cs = kzalloc(sizeof(*cs), GFP_KERNEL);
                 if (!cs)
                         return -ENOMEM;
-                spi->controller_state = cs;
+                spi_set_ctldata(spi, cs);
         }
         mpc8xxx_spi = spi_master_get_devdata(spi->master);
 
@@ -496,9 +496,13 @@ static int fsl_spi_setup(struct spi_device *spi)
 static void fsl_spi_cleanup(struct spi_device *spi)
 {
         struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(spi->master);
+        struct spi_mpc8xxx_cs *cs = spi_get_ctldata(spi);
 
         if (mpc8xxx_spi->type == TYPE_GRLIB && gpio_is_valid(spi->cs_gpio))
                 gpio_free(spi->cs_gpio);
+
+        kfree(cs);
+        spi_set_ctldata(spi, NULL);
 }
 
 static void fsl_spi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)