Merge tag 'asoc-v5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v5.1

Lots and lots of new drivers so far, a highlight being the MediaTek
BTCVSD which is a driver for a Bluetooth radio chip - the first such
driver we've had upstream.  Hopefully we will soon also see a baseband
with an upstream driver!

 - Support for only powering up channels that are actively being used.
 - Quite a few improvements to simplify the generic card drivers,
   especially the merge of the SCU cards into the main generic drivers.
 - Lots of fixes for probing on Intel systems, trying to rationalize
   things to look more standard from a framework point of view.
 - New drivers for Asahi Kasei Microdevices AK4497, Cirrus Logic CS4341,
   Google ChromeOS embedded controllers, Ingenic JZ4725B, MediaTek
   BTCVSD, MT8183 and MT6358, NXP MICFIL, Rockchip RK3328, Spreadtrum
   DMA controllers, Qualcomm WCD9335, Xilinx S/PDIF and PCM formatters.

1 files changed, 20 insertions, 21 deletions

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 29f102dcfec4..211607986134 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -533,9 +533,10 @@ static void he_init_tx_lbfp(struct he_dev *he_dev)
 
 static int he_init_tpdrq(struct he_dev *he_dev)
 {
-        he_dev->tpdrq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-                                                 CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq),
-                                                 &he_dev->tpdrq_phys, GFP_KERNEL);
+        he_dev->tpdrq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+                                                CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq),
+                                                &he_dev->tpdrq_phys,
+                                                GFP_KERNEL);
         if (he_dev->tpdrq_base == NULL) {
                 hprintk("failed to alloc tpdrq\n");
                 return -ENOMEM;
@@ -717,7 +718,7 @@ static int he_init_cs_block_rcm(struct he_dev *he_dev)
                         instead of '/ 512', use '>> 9' to prevent a call
                         to divdu3 on x86 platforms
                 */
-                rate_cps = (unsigned long long) (1 << exp) * (man + 512) >> 9;
+                rate_cps = (unsigned long long) (1UL << exp) * (man + 512) >> 9;
 
                 if (rate_cps < 10)
                         rate_cps = 10;  /* 2.2.1 minimum payload rate is 10 cps */
@@ -805,9 +806,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
                 goto out_free_rbpl_virt;
         }
 
-        he_dev->rbpl_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-                                                CONFIG_RBPL_SIZE * sizeof(struct he_rbp),
-                                                &he_dev->rbpl_phys, GFP_KERNEL);
+        he_dev->rbpl_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+                                               CONFIG_RBPL_SIZE * sizeof(struct he_rbp),
+                                               &he_dev->rbpl_phys, GFP_KERNEL);
         if (he_dev->rbpl_base == NULL) {
                 hprintk("failed to alloc rbpl_base\n");
                 goto out_destroy_rbpl_pool;
@@ -844,9 +845,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
 
         /* rx buffer ready queue */
 
-        he_dev->rbrq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-                                                CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq),
-                                                &he_dev->rbrq_phys, GFP_KERNEL);
+        he_dev->rbrq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+                                               CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq),
+                                               &he_dev->rbrq_phys, GFP_KERNEL);
         if (he_dev->rbrq_base == NULL) {
                 hprintk("failed to allocate rbrq\n");
                 goto out_free_rbpl;
@@ -868,9 +869,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
 
         /* tx buffer ready queue */
 
-        he_dev->tbrq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-                                                CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq),
-                                                &he_dev->tbrq_phys, GFP_KERNEL);
+        he_dev->tbrq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+                                               CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq),
+                                               &he_dev->tbrq_phys, GFP_KERNEL);
         if (he_dev->tbrq_base == NULL) {
                 hprintk("failed to allocate tbrq\n");
                 goto out_free_rbpq_base;
@@ -913,11 +914,9 @@ static int he_init_irq(struct he_dev *he_dev)
         /* 2.9.3.5  tail offset for each interrupt queue is located after the
                     end of the interrupt queue */
 
-        he_dev->irq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-                                               (CONFIG_IRQ_SIZE + 1)
-                                               * sizeof(struct he_irq),
-                                               &he_dev->irq_phys,
-                                               GFP_KERNEL);
+        he_dev->irq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+                                              (CONFIG_IRQ_SIZE + 1) * sizeof(struct he_irq),
+                                              &he_dev->irq_phys, GFP_KERNEL);
         if (he_dev->irq_base == NULL) {
                 hprintk("failed to allocate irq\n");
                 return -ENOMEM;
@@ -1464,9 +1463,9 @@ static int he_start(struct atm_dev *dev)
 
         /* host status page */
 
-        he_dev->hsp = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-                                          sizeof(struct he_hsp),
-                                          &he_dev->hsp_phys, GFP_KERNEL);
+        he_dev->hsp = dma_alloc_coherent(&he_dev->pci_dev->dev,
+                                         sizeof(struct he_hsp),
+                                         &he_dev->hsp_phys, GFP_KERNEL);
         if (he_dev->hsp == NULL) {
                 hprintk("failed to allocate host status page\n");
                 return -ENOMEM;