aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-04-29 04:19:01 -0400
committerMark Brown <broonie@linaro.org>2014-04-29 15:01:41 -0400
commit77538f4a98dc542ad25a1c0fa3b79c5f90c47619 (patch)
tree54bcdf1f7e09d86c1f33d2f98e26ac315334dc8d
parentc586feba880d78cab1882e1faee0395bba2b884f (diff)
spi: pl022: 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-pl022.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 51d99779682f..66d2ae21e78e 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -1111,10 +1111,8 @@ static int pl022_dma_probe(struct pl022 *pl022)
1111 } 1111 }
1112 1112
1113 pl022->dummypage = kmalloc(PAGE_SIZE, GFP_KERNEL); 1113 pl022->dummypage = kmalloc(PAGE_SIZE, GFP_KERNEL);
1114 if (!pl022->dummypage) { 1114 if (!pl022->dummypage)
1115 dev_dbg(&pl022->adev->dev, "no DMA dummypage!\n");
1116 goto err_no_dummypage; 1115 goto err_no_dummypage;
1117 }
1118 1116
1119 dev_info(&pl022->adev->dev, "setup for DMA on RX %s, TX %s\n", 1117 dev_info(&pl022->adev->dev, "setup for DMA on RX %s, TX %s\n",
1120 dma_chan_name(pl022->dma_rx_channel), 1118 dma_chan_name(pl022->dma_rx_channel),
@@ -1809,11 +1807,8 @@ static int pl022_setup(struct spi_device *spi)
1809 1807
1810 if (chip == NULL) { 1808 if (chip == NULL) {
1811 chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); 1809 chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
1812 if (!chip) { 1810 if (!chip)
1813 dev_err(&spi->dev,
1814 "cannot allocate controller state\n");
1815 return -ENOMEM; 1811 return -ENOMEM;
1816 }
1817 dev_dbg(&spi->dev, 1812 dev_dbg(&spi->dev,
1818 "allocated memory for controller's runtime state\n"); 1813 "allocated memory for controller's runtime state\n");
1819 } 1814 }
@@ -2050,10 +2045,8 @@ pl022_platform_data_dt_get(struct device *dev)
2050 } 2045 }
2051 2046
2052 pd = devm_kzalloc(dev, sizeof(struct pl022_ssp_controller), GFP_KERNEL); 2047 pd = devm_kzalloc(dev, sizeof(struct pl022_ssp_controller), GFP_KERNEL);
2053 if (!pd) { 2048 if (!pd)
2054 dev_err(dev, "cannot allocate platform data memory\n");
2055 return NULL; 2049 return NULL;
2056 }
2057 2050
2058 pd->bus_id = -1; 2051 pd->bus_id = -1;
2059 pd->enable_dma = 1; 2052 pd->enable_dma = 1;