diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-04-29 17:19:38 +0900 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-29 12:01:41 -0700 |
commit | 9deae4592b66c0b2a7832fefa192e7a506ce047e (patch) | |
tree | 6446bd007c22d7d0a6e116bac95eb60a9594a50c /drivers/spi | |
parent | 77538f4a98dc542ad25a1c0fa3b79c5f90c47619 (diff) | |
download | linux-9deae4592b66c0b2a7832fefa192e7a506ce047e.tar.bz2 |
spi: pxa2xx: remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 41185d0557fa..54e4e6593980 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -886,11 +886,8 @@ static int setup(struct spi_device *spi) chip = spi_get_ctldata(spi); if (!chip) { chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); - if (!chip) { - dev_err(&spi->dev, - "failed setup: can't allocate chip data\n"); + if (!chip) return -ENOMEM; - } if (drv_data->ssp_type == CE4100_SSP) { if (spi->chip_select > 4) { @@ -1037,11 +1034,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) return NULL; pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) { - dev_err(&pdev->dev, - "failed to allocate memory for platform data\n"); + if (!pdata) return NULL; - } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) |