drop 2 4.9 patches

diff --git a/queue-4.9/series b/queue-4.9/series
index 8f014c17ea106fdb7447bb66e54020d292c0bf08..4a6ede1952f78c0812f4ec3e08c91905fa9d1dce 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -8,8 +8,6 @@ x86-paravirt-make-native_save_fl-extern-inline.patch
 ocfs2-subsystem.su_mutex-is-required-while-accessing-the-item-ci_parent.patch
 ocfs2-ip_alloc_sem-should-be-taken-in-ocfs2_get_block.patch
 mtd-m25p80-consider-max-message-size-in-m25p80_read.patch
-spi-bcm63xx-make-spi-subsystem-aware-of-message-size-limits.patch
-spi-bcm63xx-fix-typo-in-bcm63xx_spi_max_length-breaking-compilation.patch
 bcm63xx_enet-correct-clock-usage.patch
 bcm63xx_enet-do-not-write-to-random-dma-channel-on-bcm6345.patch
 crypto-crypto4xx-remove-bad-list_del.patch

diff --git a/queue-4.9/spi-bcm63xx-fix-typo-in-bcm63xx_spi_max_length-breaking-compilation.patch b/queue-4.9/spi-bcm63xx-fix-typo-in-bcm63xx_spi_max_length-breaking-compilation.patch
deleted file mode 100644 (file)
index a199fcf..0000000
--- a/queue-4.9/spi-bcm63xx-fix-typo-in-bcm63xx_spi_max_length-breaking-compilation.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ccd0657c33b2c3701c5b14725284b7e671d3fb93 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Wed, 22 Feb 2017 00:30:40 +0100
-Subject: spi/bcm63xx: fix typo in bcm63xx_spi_max_length breaking compilation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jonas Gorski <jonas.gorski@gmail.com>
-
-commit ccd0657c33b2c3701c5b14725284b7e671d3fb93 upstream.
-
-Fix compilation by renaming argument dev to spi as expected by the code.
-
-Fixes the following error:
-
-drivers/spi/spi-bcm63xx.c: In function ‘bcm63xx_spi_max_length’:
-drivers/spi/spi-bcm63xx.c:434:50: error: ‘spi’ undeclared (first use in this function)
-  struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
-                                                  ^~~
-
-Fixes: 0135c03df914 ("spi/bcm63xx: make spi subsystem aware of message size limits")
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-bcm63xx.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -428,7 +428,7 @@ static irqreturn_t bcm63xx_spi_interrupt
-       return IRQ_HANDLED;
- }
- 
--static size_t bcm63xx_spi_max_length(struct spi_device *dev)
-+static size_t bcm63xx_spi_max_length(struct spi_device *spi)
- {
-       struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
- 

diff --git a/queue-4.9/spi-bcm63xx-make-spi-subsystem-aware-of-message-size-limits.patch b/queue-4.9/spi-bcm63xx-make-spi-subsystem-aware-of-message-size-limits.patch
deleted file mode 100644 (file)
index 463ea75..0000000
--- a/queue-4.9/spi-bcm63xx-make-spi-subsystem-aware-of-message-size-limits.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0135c03df914f0481c61f097c78d37cece84f330 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Mon, 20 Feb 2017 11:50:09 +0100
-Subject: spi/bcm63xx: make spi subsystem aware of message size limits
-
-From: Jonas Gorski <jonas.gorski@gmail.com>
-
-commit 0135c03df914f0481c61f097c78d37cece84f330 upstream.
-
-The bcm63xx SPI controller does not allow manual control of the CS
-lines and will toggle it automatically before and after sending data,
-so we are limited to messages that fit in the FIFO buffer. Since the CS
-lines aren't available as GPIOs either, we will need to make slave
-drivers aware of this limitation so they can handle them accordingly.
-
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-bcm63xx.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/spi/spi-bcm63xx.c
-+++ b/drivers/spi/spi-bcm63xx.c
-@@ -428,6 +428,13 @@ static irqreturn_t bcm63xx_spi_interrupt
-       return IRQ_HANDLED;
- }
- 
-+static size_t bcm63xx_spi_max_length(struct spi_device *dev)
-+{
-+      struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master);
-+
-+      return bs->fifo_size;
-+}
-+
- static const unsigned long bcm6348_spi_reg_offsets[] = {
-       [SPI_CMD]               = SPI_6348_CMD,
-       [SPI_INT_STATUS]        = SPI_6348_INT_STATUS,
-@@ -541,6 +548,8 @@ static int bcm63xx_spi_probe(struct plat
-       master->transfer_one_message = bcm63xx_spi_transfer_one;
-       master->mode_bits = MODEBITS;
-       master->bits_per_word_mask = SPI_BPW_MASK(8);
-+      master->max_transfer_size = bcm63xx_spi_max_length;
-+      master->max_message_size = bcm63xx_spi_max_length;
-       master->auto_runtime_pm = true;
-       bs->msg_type_shift = bs->reg_offsets[SPI_MSG_TYPE_SHIFT];
-       bs->msg_ctl_width = bs->reg_offsets[SPI_MSG_CTL_WIDTH];