summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.8/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.8/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch b/target/linux/brcm63xx/patches-3.8/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch
deleted file mode 100644
index f684d83541..0000000000
--- a/target/linux/brcm63xx/patches-3.8/012-spi-bcm63xx-inline-bcm63xx_spi_check_transfer.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3fffc5f76c830c375692a67948734168ee4c516a Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Mon, 11 Mar 2013 13:59:30 +0100
-Subject: [PATCH 10/12] spi/bcm63xx: inline bcm63xx_spi_check_transfer
-
-It only does one check, so just do the check directly in the caller.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
----
- drivers/spi/spi-bcm63xx.c | 19 +++++--------------
- 1 file changed, 5 insertions(+), 14 deletions(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -93,18 +93,6 @@ static const unsigned bcm63xx_spi_freq_t
- { 391000, SPI_CLK_0_391MHZ }
- };
-
--static int bcm63xx_spi_check_transfer(struct spi_device *spi,
-- struct spi_transfer *t)
--{
-- if (t->bits_per_word != 8) {
-- dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-- __func__, t->bits_per_word);
-- return -EINVAL;
-- }
--
-- return 0;
--}
--
- static void bcm63xx_spi_setup_transfer(struct spi_device *spi,
- struct spi_transfer *t)
- {
-@@ -293,9 +281,12 @@ static int bcm63xx_spi_transfer_one(stru
- * full-duplex transfers.
- */
- list_for_each_entry(t, &m->transfers, transfer_list) {
-- status = bcm63xx_spi_check_transfer(spi, t);
-- if (status < 0)
-+ if (t->bits_per_word != 8) {
-+ dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-+ __func__, t->bits_per_word);
-+ status = -EINVAL;
- goto exit;
-+ }
-
- if (!first)
- first = t;