diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-09-11 16:32:00 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-11 16:32:00 +0000 |
commit | 0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e (patch) | |
tree | 633627a1e4d5761b609c7ff1682b69ee85b06d9f /target/linux/brcm2708/patches-4.1/0158-spi-bcm2835-bcm2835_dma_release-can-be-static.patch | |
parent | 2ce833060a6ac412d0df362edb950b19da9af04c (diff) | |
download | master-31e0f0ae-0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e.tar.gz master-31e0f0ae-0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e.tar.bz2 master-31e0f0ae-0b5d87fd30d3d8edd27cbcc9b7688b1f9d740b2e.zip |
brcm2708: update 4.1 patches
As usual, this patches were taken (and rebased) from
https://github.com/raspberrypi/linux/commits/rpi-4.1.y
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 46853
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0158-spi-bcm2835-bcm2835_dma_release-can-be-static.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.1/0158-spi-bcm2835-bcm2835_dma_release-can-be-static.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0158-spi-bcm2835-bcm2835_dma_release-can-be-static.patch b/target/linux/brcm2708/patches-4.1/0158-spi-bcm2835-bcm2835_dma_release-can-be-static.patch new file mode 100644 index 0000000000..8e4b1d4a5f --- /dev/null +++ b/target/linux/brcm2708/patches-4.1/0158-spi-bcm2835-bcm2835_dma_release-can-be-static.patch @@ -0,0 +1,32 @@ +From 35801a979c9ede9ec11ad6aca777376a337e392e Mon Sep 17 00:00:00 2001 +From: kbuild test robot <fengguang.wu@intel.com> +Date: Tue, 12 May 2015 19:43:59 +0800 +Subject: [PATCH 158/171] spi: bcm2835: bcm2835_dma_release() can be static + +Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> +Signed-off-by: Mark Brown <broonie@kernel.org> +(cherry picked from commit 29ad1a7a9e08f1d2b6795c5278a0c0fd23679ded) +--- + drivers/spi/spi-bcm2835.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/spi/spi-bcm2835.c ++++ b/drivers/spi/spi-bcm2835.c +@@ -401,7 +401,7 @@ static bool bcm2835_spi_can_dma(struct s + return true; + } + +-void bcm2835_dma_release(struct spi_master *master) ++static void bcm2835_dma_release(struct spi_master *master) + { + if (master->dma_tx) { + dmaengine_terminate_all(master->dma_tx); +@@ -415,7 +415,7 @@ void bcm2835_dma_release(struct spi_mast + } + } + +-void bcm2835_dma_init(struct spi_master *master, struct device *dev) ++static void bcm2835_dma_init(struct spi_master *master, struct device *dev) + { + struct dma_slave_config slave_config; + const __be32 *addr; |