ASoC: drop byt patch with post-4.8 dependencies

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 12 insertions, 53 deletions

diff --git a/queue/ASoC-Intel-bytcr_rt5640-quirks-for-Insyde-devices.patch b/queue/ASoC-Intel-bytcr_rt5640-quirks-for-Insyde-devices.patch
deleted file mode 100644
index f6d077f..0000000
--- a/queue/ASoC-Intel-bytcr_rt5640-quirks-for-Insyde-devices.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 651534e5bf600c087fba231a30a6e8bbe2aded52 Mon Sep 17 00:00:00 2001
-From: youling257 <youling257@gmail.com>
-Date: Wed, 4 Jan 2017 15:44:53 -0600
-Subject: [PATCH] ASoC: Intel: bytcr_rt5640: quirks for Insyde devices
-
-commit 571800487837263e914ef68681e4ad6a57d49c7f upstream.
-
-There are literally dozens of Insyde devices with a different
-name but with the same audio routing. Use a generic quirk to
-match on vendor name only to avoid recurring edits of the
-same thing.
-
-Signed-off-by: youling257 <youling257@gmail.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-
-diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
-index 88efb62439ba..1390b9b68465 100644
---- a/sound/soc/intel/boards/bytcr_rt5640.c
-+++ b/sound/soc/intel/boards/bytcr_rt5640.c
-@@ -149,6 +149,16 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
- 		},
- 		.driver_data = (unsigned long *)BYT_RT5640_IN1_MAP,
- 	},
-+	{
-+		.callback = byt_rt5640_quirk_cb,
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
-+		},
-+		.driver_data = (unsigned long *)(BYT_RT5640_IN3_MAP |
-+						 BYT_RT5640_MCLK_EN |
-+						 BYT_RT5640_SSP0_AIF1),
-+
-+	},
- 	{}
- };
- 
--- 
-2.12.0
-
diff --git a/queue/series b/queue/series
index 829e77a..c8a0622 100644
--- a/queue/series
+++ b/queue/series
@@ -82,7 +82,6 @@ drm-i915-Remove-.is_mobile-field-from-platform-struc.patch
 drm-i915-fix-INTEL_BDW_IDS-definition.patch
 drm-i915-more-.is_mobile-cleanups-for-BDW.patch
 drm-i915-actually-drive-the-BDW-reserved-IDs.patch
-ASoC-Intel-bytcr_rt5640-quirks-for-Insyde-devices.patch
 scsi-ufs-introduce-a-new-ufshcd_statea-UFSHCD_STATE_.patch
 scsi-ufs-issue-link-starup-2-times-if-device-isn-t-a.patch
 usb-chipidea-msm-Rely-on-core-to-override-AHBBURST.patch
diff --git a/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch b/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch
index 451b30e..43dcd46 100644
--- a/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch
+++ b/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch
@@ -1,4 +1,4 @@
-From ab22d2604c86ceb01bb2725c9860b88a7dd383bb Mon Sep 17 00:00:00 2001
+From fd058ecfe97b25bf4db3bbfc703ddb9a566786f4 Mon Sep 17 00:00:00 2001
 From: Xiubo Li <lixiubo@cmss.chinamobile.com>
 Date: Mon, 27 Mar 2017 17:07:40 +0800
 Subject: [PATCH] tcmu: Fix possible overwrite of t_data_sg's last iov[]
@@ -23,12 +23,13 @@ Reviewed-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
 Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com>
 Cc: stable@vger.kernel.org # 3.18+
 Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
-index 6a17c78e4662..e58dfd4fe448 100644
+index b8a986c2c567..2ffd4177feaa 100644
 --- a/drivers/target/target_core_user.c
 +++ b/drivers/target/target_core_user.c
-@@ -394,6 +394,20 @@ static bool is_ring_space_avail(struct tcmu_dev *udev, size_t cmd_size, size_t d
+@@ -389,6 +389,20 @@ static bool is_ring_space_avail(struct tcmu_dev *udev, size_t cmd_size, size_t d
  	return true;
  }
  
@@ -46,10 +47,10 @@ index 6a17c78e4662..e58dfd4fe448 100644
 +	return data_length;
 +}
 +
- static sense_reason_t
- tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
+ static int tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
  {
-@@ -407,7 +421,7 @@ tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
+ 	struct tcmu_dev *udev = tcmu_cmd->tcmu_dev;
+@@ -401,7 +415,7 @@ static int tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
  	uint32_t cmd_head;
  	uint64_t cdb_off;
  	bool copy_to_data_area;
@@ -58,7 +59,7 @@ index 6a17c78e4662..e58dfd4fe448 100644
  	DECLARE_BITMAP(old_bitmap, DATA_BLOCK_BITS);
  
  	if (test_bit(TCMU_DEV_BIT_BROKEN, &udev->flags))
-@@ -433,11 +447,6 @@ tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
+@@ -427,11 +441,6 @@ static int tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
  
  	mb = udev->mb_addr;
  	cmd_head = mb->cmd_head % udev->cmdr_size; /* UAM */
@@ -67,10 +68,10 @@ index 6a17c78e4662..e58dfd4fe448 100644
 -		BUG_ON(!(se_cmd->t_bidi_data_sg && se_cmd->t_bidi_data_nents));
 -		data_length += se_cmd->t_bidi_data_sg->length;
 -	}
- 	if ((command_size > (udev->cmdr_size / 2)) ||
- 	    data_length > udev->data_size) {
- 		pr_warn("TCMU: Request of size %zu/%zu is too big for %u/%zu "
-@@ -511,11 +520,14 @@ tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
+ 	if ((command_size > (udev->cmdr_size / 2))
+ 	    || data_length > udev->data_size)
+ 		pr_warn("TCMU: Request of size %zu/%zu may be too big for %u/%zu "
+@@ -500,11 +509,14 @@ static int tcmu_queue_cmd_ring(struct tcmu_cmd *tcmu_cmd)
  	entry->req.iov_dif_cnt = 0;
  
  	/* Handle BIDI commands */