summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-fsl-espi.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-03-30 16:43:23 +0800
committerMark Brown <broonie@linaro.org>2014-04-14 17:18:55 +0100
commitabcadeb255074d1351d110ef696b647859fa3d5b (patch)
tree9324e03772f0f65e838764d6bd91b517f4e0b38b /drivers/spi/spi-fsl-espi.c
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
downloadtalos-op-linux-abcadeb255074d1351d110ef696b647859fa3d5b.tar.gz
talos-op-linux-abcadeb255074d1351d110ef696b647859fa3d5b.zip
spi: fsl: Kill mpc8xxx_spi_cleanup and convert fsl_espi_setup to use devm_kzalloc
In current code, master->cleanup and master->setup are not set in the same function. This makes it hard to read and not good for code maintain. One example is in fsl-spi.c, master->cleanup is overrided in mpc8xxx_spi_probe() which leads to a memory leak. This patch removes mpc8xxx_spi_cleanup() and converts fsl_espi_setup to use devm_kzalloc so we don't need to take care of freeing memory. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-fsl-espi.c')
-rw-r--r--drivers/spi/spi-fsl-espi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index e767f5831b9c..3cf7d65bc739 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -458,7 +458,7 @@ static int fsl_espi_setup(struct spi_device *spi)
return -EINVAL;
if (!cs) {
- cs = kzalloc(sizeof *cs, GFP_KERNEL);
+ cs = devm_kzalloc(&spi->dev, sizeof(*cs), GFP_KERNEL);
if (!cs)
return -ENOMEM;
spi->controller_state = cs;
OpenPOWER on IntegriCloud