spi: dw: Don't call kfree for memory allocated by devm_kzalloc
authorAxel Lin <axel.lin@ingics.com>
Tue, 25 Mar 2014 04:44:13 +0000 (12:44 +0800)
committerMark Brown <broonie@linaro.org>
Fri, 28 Mar 2014 11:48:55 +0000 (11:48 +0000)
With devm_kzalloc, the memory is automatically freed when spi_device detach from
the bus.

Fixes: commit 43f627ac9de42 (spi: dw: fix memory leak on error path)
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stabe@vger.kernel.org
drivers/spi/spi-dw.c

index 9e4a0aa7d341782c5df5e9b2538a0e6e2f56ff05..79fd1fa95bf26051f104af85086dbb0e70404e80 100644 (file)
@@ -665,12 +665,6 @@ static int dw_spi_setup(struct spi_device *spi)
        return 0;
 }
 
-static void dw_spi_cleanup(struct spi_device *spi)
-{
-       struct chip_data *chip = spi_get_ctldata(spi);
-       kfree(chip);
-}
-
 static int init_queue(struct dw_spi *dws)
 {
        INIT_LIST_HEAD(&dws->queue);
@@ -800,7 +794,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
        master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16);
        master->bus_num = dws->bus_num;
        master->num_chipselect = dws->num_cs;
-       master->cleanup = dw_spi_cleanup;
        master->setup = dw_spi_setup;
        master->transfer = dw_spi_transfer;
        master->max_speed_hz = dws->max_freq;