]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
spi: s3c24xx: Convert to use devm_kzalloc
authorAxel Lin <axel.lin@ingics.com>
Mon, 31 Mar 2014 03:37:29 +0000 (11:37 +0800)
committerMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 16:19:39 +0000 (17:19 +0100)
Simplify the cleanup code.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-s3c24xx.c

index bed23384dfab5858f91c612f352df3a7af7b4aed..6db14e53af1787cfd3b2745f616dcc6e5fbad8a3 100644 (file)
@@ -183,7 +183,9 @@ static int s3c24xx_spi_setup(struct spi_device *spi)
 
        /* allocate settings on the first call */
        if (!cs) {
-               cs = kzalloc(sizeof(struct s3c24xx_spi_devstate), GFP_KERNEL);
+               cs = devm_kzalloc(&spi->dev,
+                                 sizeof(struct s3c24xx_spi_devstate),
+                                 GFP_KERNEL);
                if (!cs) {
                        dev_err(&spi->dev, "no memory for controller state\n");
                        return -ENOMEM;
@@ -209,11 +211,6 @@ static int s3c24xx_spi_setup(struct spi_device *spi)
        return 0;
 }
 
-static void s3c24xx_spi_cleanup(struct spi_device *spi)
-{
-       kfree(spi->controller_state);
-}
-
 static inline unsigned int hw_txbyte(struct s3c24xx_spi *hw, int count)
 {
        return hw->tx ? hw->tx[count] : 0;
@@ -543,7 +540,6 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
        hw->bitbang.txrx_bufs      = s3c24xx_spi_txrx;
 
        hw->master->setup  = s3c24xx_spi_setup;
-       hw->master->cleanup = s3c24xx_spi_cleanup;
 
        dev_dbg(hw->dev, "bitbang at %p\n", &hw->bitbang);