|
|
@@ -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);
|
|
|
|