aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-04-29 04:19:38 -0400
committerMark Brown <broonie@linaro.org>2014-04-29 15:01:41 -0400
commit9deae4592b66c0b2a7832fefa192e7a506ce047e (patch)
tree6446bd007c22d7d0a6e116bac95eb60a9594a50c
parent77538f4a98dc542ad25a1c0fa3b79c5f90c47619 (diff)
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>
-rw-r--r--drivers/spi/spi-pxa2xx.c10
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)
886 chip = spi_get_ctldata(spi); 886 chip = spi_get_ctldata(spi);
887 if (!chip) { 887 if (!chip) {
888 chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); 888 chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
889 if (!chip) { 889 if (!chip)
890 dev_err(&spi->dev,
891 "failed setup: can't allocate chip data\n");
892 return -ENOMEM; 890 return -ENOMEM;
893 }
894 891
895 if (drv_data->ssp_type == CE4100_SSP) { 892 if (drv_data->ssp_type == CE4100_SSP) {
896 if (spi->chip_select > 4) { 893 if (spi->chip_select > 4) {
@@ -1037,11 +1034,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
1037 return NULL; 1034 return NULL;
1038 1035
1039 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); 1036 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
1040 if (!pdata) { 1037 if (!pdata)
1041 dev_err(&pdev->dev,
1042 "failed to allocate memory for platform data\n");
1043 return NULL; 1038 return NULL;
1044 }
1045 1039
1046 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1040 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1047 if (!res) 1041 if (!res)