rtlwifi: switch from 'pci_' to 'dma_' API

The wrappers in include/linux/pci-dma-compat.h should go away.

The patch has been generated with the coccinelle script below and has been
hand modified to replace GFP_ with a correct flag.
It has been compile tested.

The only file where some GFP_ flags are updated is 'pci.c'.

When memory is allocated in '_rtl_pci_init_tx_ring()' and
'_rtl_pci_init_rx_ring()' GFP_KERNEL can be used because both functions are
called from a probe function and no spinlock is taken.

The call chain is:
  rtl_pci_probe
    --> rtl_pci_init
      --> _rtl_pci_init_trx_ring
        --> _rtl_pci_init_rx_ring
        --> _rtl_pci_init_tx_ring

@@
@@
-    PCI_DMA_BIDIRECTIONAL
+    DMA_BIDIRECTIONAL

@@
@@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@
@@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@
@@
-    PCI_DMA_NONE
+    DMA_NONE

@@
expression e1, e2, e3;
@@
-    pci_alloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3;
@@
-    pci_zalloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3, e4;
@@
-    pci_free_consistent(e1, e2, e3, e4)
+    dma_free_coherent(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_single(e1, e2, e3, e4)
+    dma_map_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_single(e1, e2, e3, e4)
+    dma_unmap_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4, e5;
@@
-    pci_map_page(e1, e2, e3, e4, e5)
+    dma_map_page(&e1->dev, e2, e3, e4, e5)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_page(e1, e2, e3, e4)
+    dma_unmap_page(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_sg(e1, e2, e3, e4)
+    dma_map_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_sg(e1, e2, e3, e4)
+    dma_unmap_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_cpu(e1, e2, e3, e4)
+    dma_sync_single_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_device(e1, e2, e3, e4)
+    dma_sync_single_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_cpu(e1, e2, e3, e4)
+    dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_device(e1, e2, e3, e4)
+    dma_sync_sg_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2;
@@
-    pci_dma_mapping_error(e1, e2)
+    dma_mapping_error(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_dma_mask(e1, e2)
+    dma_set_mask(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_consistent_dma_mask(e1, e2)
+    dma_set_coherent_mask(&e1->dev, e2)

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200907193828.318233-1-christophe.jaillet@wanadoo.fr

diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index f1ae9c2..d9f9011 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -547,11 +547,10 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                ring->idx = (ring->idx + 1) % ring->entries;
 
                skb = __skb_dequeue(&ring->queue);
-               pci_unmap_single(rtlpci->pdev,
-                                rtlpriv->cfg->ops->
-                                            get_desc(hw, (u8 *)entry, true,
-                                                     HW_DESC_TXBUFF_ADDR),
-                                skb->len, PCI_DMA_TODEVICE);
+               dma_unmap_single(&rtlpci->pdev->dev,
+                                rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
+                                               true, HW_DESC_TXBUFF_ADDR),
+                                skb->len, DMA_TO_DEVICE);
 
                /* remove early mode header */
                if (rtlpriv->rtlhal.earlymode_enable)
@@ -646,10 +645,10 @@ static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw,
 remap:
        /* just set skb->cb to mapping addr for pci_unmap_single use */
        *((dma_addr_t *)skb->cb) =
-               pci_map_single(rtlpci->pdev, skb_tail_pointer(skb),
-                              rtlpci->rxbuffersize, PCI_DMA_FROMDEVICE);
+               dma_map_single(&rtlpci->pdev->dev, skb_tail_pointer(skb),
+                              rtlpci->rxbuffersize, DMA_FROM_DEVICE);
        bufferaddress = *((dma_addr_t *)skb->cb);
-       if (pci_dma_mapping_error(rtlpci->pdev, bufferaddress))
+       if (dma_mapping_error(&rtlpci->pdev->dev, bufferaddress))
                return 0;
        rtlpci->rx_ring[rxring_idx].rx_buf[desc_idx] = skb;
        if (rtlpriv->use_new_trx_flow) {
@@ -773,8 +772,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                 * AAAAAAttention !!!
                 * We can NOT access 'skb' before 'pci_unmap_single'
                 */
-               pci_unmap_single(rtlpci->pdev, *((dma_addr_t *)skb->cb),
-                                rtlpci->rxbuffersize, PCI_DMA_FROMDEVICE);
+               dma_unmap_single(&rtlpci->pdev->dev, *((dma_addr_t *)skb->cb),
+                                rtlpci->rxbuffersize, DMA_FROM_DEVICE);
 
                /* get a new skb - if fail, old one will be reused */
                new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
@@ -1094,10 +1093,10 @@ static void _rtl_pci_prepare_bcn_tasklet(struct tasklet_struct *t)
        else
                entry = (u8 *)(&ring->desc[ring->idx]);
        if (pskb) {
-               pci_unmap_single(rtlpci->pdev,
-                                rtlpriv->cfg->ops->get_desc(
-                                hw, (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
-                                pskb->len, PCI_DMA_TODEVICE);
+               dma_unmap_single(&rtlpci->pdev->dev,
+                                rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
+                                               true, HW_DESC_TXBUFF_ADDR),
+                                pskb->len, DMA_TO_DEVICE);
                kfree_skb(pskb);
        }
 
@@ -1217,9 +1216,9 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
        /* alloc tx buffer desc for new trx flow*/
        if (rtlpriv->use_new_trx_flow) {
                buffer_desc =
-                  pci_zalloc_consistent(rtlpci->pdev,
-                                        sizeof(*buffer_desc) * entries,
-                                        &buffer_desc_dma);
+                  dma_alloc_coherent(&rtlpci->pdev->dev,
+                                     sizeof(*buffer_desc) * entries,
+                                     &buffer_desc_dma, GFP_KERNEL);
 
                if (!buffer_desc || (unsigned long)buffer_desc & 0xFF) {
                        pr_err("Cannot allocate TX ring (prio = %d)\n",
@@ -1235,8 +1234,8 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
        }
 
        /* alloc dma for this ring */
-       desc = pci_zalloc_consistent(rtlpci->pdev,
-                                    sizeof(*desc) * entries, &desc_dma);
+       desc = dma_alloc_coherent(&rtlpci->pdev->dev, sizeof(*desc) * entries,
+                                 &desc_dma, GFP_KERNEL);
 
        if (!desc || (unsigned long)desc & 0xFF) {
                pr_err("Cannot allocate TX ring (prio = %d)\n", prio);
@@ -1279,11 +1278,10 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx)
                struct rtl_rx_buffer_desc *entry = NULL;
                /* alloc dma for this ring */
                rtlpci->rx_ring[rxring_idx].buffer_desc =
-                   pci_zalloc_consistent(rtlpci->pdev,
-                                         sizeof(*rtlpci->rx_ring[rxring_idx].
-                                                buffer_desc) *
-                                                rtlpci->rxringcount,
-                                         &rtlpci->rx_ring[rxring_idx].dma);
+                   dma_alloc_coherent(&rtlpci->pdev->dev,
+                                      sizeof(*rtlpci->rx_ring[rxring_idx].buffer_desc) *
+                                      rtlpci->rxringcount,
+                                      &rtlpci->rx_ring[rxring_idx].dma, GFP_KERNEL);
                if (!rtlpci->rx_ring[rxring_idx].buffer_desc ||
                    (ulong)rtlpci->rx_ring[rxring_idx].buffer_desc & 0xFF) {
                        pr_err("Cannot allocate RX ring\n");
@@ -1303,10 +1301,10 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw, int rxring_idx)
                u8 tmp_one = 1;
                /* alloc dma for this ring */
                rtlpci->rx_ring[rxring_idx].desc =
-                   pci_zalloc_consistent(rtlpci->pdev,
-                                         sizeof(*rtlpci->rx_ring[rxring_idx].
-                                         desc) * rtlpci->rxringcount,
-                                         &rtlpci->rx_ring[rxring_idx].dma);
+                   dma_alloc_coherent(&rtlpci->pdev->dev,
+                                      sizeof(*rtlpci->rx_ring[rxring_idx].desc) *
+                                      rtlpci->rxringcount,
+                                      &rtlpci->rx_ring[rxring_idx].dma, GFP_KERNEL);
                if (!rtlpci->rx_ring[rxring_idx].desc ||
                    (unsigned long)rtlpci->rx_ring[rxring_idx].desc & 0xFF) {
                        pr_err("Cannot allocate RX ring\n");
@@ -1346,24 +1344,23 @@ static void _rtl_pci_free_tx_ring(struct ieee80211_hw *hw,
                else
                        entry = (u8 *)(&ring->desc[ring->idx]);
 
-               pci_unmap_single(rtlpci->pdev,
+               dma_unmap_single(&rtlpci->pdev->dev,
                                 rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
-                                                  true,
-                                                  HW_DESC_TXBUFF_ADDR),
-                                skb->len, PCI_DMA_TODEVICE);
+                                               true, HW_DESC_TXBUFF_ADDR),
+                                skb->len, DMA_TO_DEVICE);
                kfree_skb(skb);
                ring->idx = (ring->idx + 1) % ring->entries;
        }
 
        /* free dma of this ring */
-       pci_free_consistent(rtlpci->pdev,
-                           sizeof(*ring->desc) * ring->entries,
-                           ring->desc, ring->dma);
+       dma_free_coherent(&rtlpci->pdev->dev,
+                         sizeof(*ring->desc) * ring->entries, ring->desc,
+                         ring->dma);
        ring->desc = NULL;
        if (rtlpriv->use_new_trx_flow) {
-               pci_free_consistent(rtlpci->pdev,
-                                   sizeof(*ring->buffer_desc) * ring->entries,
-                                   ring->buffer_desc, ring->buffer_desc_dma);
+               dma_free_coherent(&rtlpci->pdev->dev,
+                                 sizeof(*ring->buffer_desc) * ring->entries,
+                                 ring->buffer_desc, ring->buffer_desc_dma);
                ring->buffer_desc = NULL;
        }
 }
@@ -1380,25 +1377,25 @@ static void _rtl_pci_free_rx_ring(struct ieee80211_hw *hw, int rxring_idx)
 
                if (!skb)
                        continue;
-               pci_unmap_single(rtlpci->pdev, *((dma_addr_t *)skb->cb),
-                                rtlpci->rxbuffersize, PCI_DMA_FROMDEVICE);
+               dma_unmap_single(&rtlpci->pdev->dev, *((dma_addr_t *)skb->cb),
+                                rtlpci->rxbuffersize, DMA_FROM_DEVICE);
                kfree_skb(skb);
        }
 
        /* free dma of this ring */
        if (rtlpriv->use_new_trx_flow) {
-               pci_free_consistent(rtlpci->pdev,
-                                   sizeof(*rtlpci->rx_ring[rxring_idx].
-                                   buffer_desc) * rtlpci->rxringcount,
-                                   rtlpci->rx_ring[rxring_idx].buffer_desc,
-                                   rtlpci->rx_ring[rxring_idx].dma);
+               dma_free_coherent(&rtlpci->pdev->dev,
+                                 sizeof(*rtlpci->rx_ring[rxring_idx].buffer_desc) *
+                                 rtlpci->rxringcount,
+                                 rtlpci->rx_ring[rxring_idx].buffer_desc,
+                                 rtlpci->rx_ring[rxring_idx].dma);
                rtlpci->rx_ring[rxring_idx].buffer_desc = NULL;
        } else {
-               pci_free_consistent(rtlpci->pdev,
-                                   sizeof(*rtlpci->rx_ring[rxring_idx].desc) *
-                                   rtlpci->rxringcount,
-                                   rtlpci->rx_ring[rxring_idx].desc,
-                                   rtlpci->rx_ring[rxring_idx].dma);
+               dma_free_coherent(&rtlpci->pdev->dev,
+                                 sizeof(*rtlpci->rx_ring[rxring_idx].desc) *
+                                 rtlpci->rxringcount,
+                                 rtlpci->rx_ring[rxring_idx].desc,
+                                 rtlpci->rx_ring[rxring_idx].dma);
                rtlpci->rx_ring[rxring_idx].desc = NULL;
        }
 }
@@ -1526,13 +1523,10 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
                                else
                                        entry = (u8 *)(&ring->desc[ring->idx]);
 
-                               pci_unmap_single(rtlpci->pdev,
-                                                rtlpriv->cfg->ops->
-                                                        get_desc(hw, (u8 *)
-                                                        entry,
-                                                        true,
-                                                        HW_DESC_TXBUFF_ADDR),
-                                                skb->len, PCI_DMA_TODEVICE);
+                               dma_unmap_single(&rtlpci->pdev->dev,
+                                                rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
+                                                               true, HW_DESC_TXBUFF_ADDR),
+                                                skb->len, DMA_TO_DEVICE);
                                dev_kfree_skb_irq(skb);
                                ring->idx = (ring->idx + 1) % ring->entries;
                        }
@@ -2171,8 +2165,8 @@ int rtl_pci_probe(struct pci_dev *pdev,
        }
 
        if (((struct rtl_hal_cfg *)id->driver_data)->mod_params->dma64 &&
-           !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
-               if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
+           !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+               if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
                        WARN_ONCE(true,
                                  "Unable to obtain 64bit DMA for consistent allocations\n");
                        err = -ENOMEM;
@@ -2180,8 +2174,8 @@ int rtl_pci_probe(struct pci_dev *pdev,
                }
 
                platform_enable_dma64(pdev, true);
-       } else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
-               if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
+       } else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
+               if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) {
                        WARN_ONCE(true,
                                  "rtlwifi: Unable to obtain 32bit DMA for consistent allocations\n");
                        err = -ENOMEM;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
index 98b1665..4c8d71f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
@@ -75,11 +75,10 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw)
                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
                struct sk_buff *skb = __skb_dequeue(&ring->queue);
 
-               pci_unmap_single(rtlpci->pdev,
-                                rtlpriv->cfg->ops->get_desc(
-                                hw,
-                                (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
-                                skb->len, PCI_DMA_TODEVICE);
+               dma_unmap_single(&rtlpci->pdev->dev,
+                                rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
+                                               true, HW_DESC_TXBUFF_ADDR),
+                                skb->len, DMA_TO_DEVICE);
                kfree_skb(skb);
                ring->idx = (ring->idx + 1) % ring->entries;
        }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
index eda4aef..8f76892 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
@@ -515,9 +515,9 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw,
                memset(skb->data, 0, EM_HDR_LEN);
        }
        buf_len = skb->len;
-       mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
-                                PCI_DMA_TODEVICE);
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       mapping = dma_map_single(&rtlpci->pdev->dev, skb->data, skb->len,
+                                DMA_TO_DEVICE);
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;
@@ -674,14 +674,13 @@ void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw,
        u8 fw_queue = QSLT_BEACON;
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
 
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
        __le16 fc = hdr->frame_control;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
index 29dd76e..c063530 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
@@ -361,13 +361,12 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
        bool lastseg = ((hdr->frame_control &
                         cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
 
        u8 bw_40 = 0;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;
@@ -528,14 +527,13 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
        u8 fw_queue = QSLT_BEACON;
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
 
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
        __le16 fc = hdr->frame_control;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
index 7fd5469..8944712 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
@@ -508,9 +508,9 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
                memset(skb->data, 0, EM_HDR_LEN);
        }
        buf_len = skb->len;
-       mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
-                                PCI_DMA_TODEVICE);
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       mapping = dma_map_single(&rtlpci->pdev->dev, skb->data, skb->len,
+                                DMA_TO_DEVICE);
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;
@@ -664,13 +664,13 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
        struct rtl_ps_ctl *ppsc = rtl_psc(rtlpriv);
        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
        u8 fw_queue = QSLT_BEACON;
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                   skb->data, skb->len, PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
        __le16 fc = hdr->frame_control;
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
index f350c22..eef7a04 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
@@ -675,9 +675,9 @@ void rtl92ee_tx_fill_desc(struct ieee80211_hw *hw,
                skb_push(skb, EM_HDR_LEN);
                memset(skb->data, 0, EM_HDR_LEN);
        }
-       mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
-                                PCI_DMA_TODEVICE);
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       mapping = dma_map_single(&rtlpci->pdev->dev, skb->data, skb->len,
+                                DMA_TO_DEVICE);
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;
@@ -834,13 +834,12 @@ void rtl92ee_tx_fill_cmddesc(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
        u8 fw_queue = QSLT_BEACON;
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
        u8 txdesc_len = 40;
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
index f2b0d3e..3803410 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
@@ -328,11 +328,11 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
        bool firstseg = (!(hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG)));
        bool lastseg = (!(hdr->frame_control &
                        cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)));
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
-                   PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
        u8 bw_40 = 0;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;
@@ -500,10 +500,10 @@ void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc8,
        struct rtl_tcb_desc *tcb_desc = (struct rtl_tcb_desc *)(skb->cb);
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
-                       PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
index 6bcd897..159f86e 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
@@ -362,12 +362,11 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
        bool lastseg = ((hdr->frame_control &
                         cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
        u8 bw_40 = 0;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;
@@ -529,14 +528,13 @@ void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,
        u8 fw_queue = QSLT_BEACON;
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
 
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
        __le16 fc = hdr->frame_control;
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
index fcbe472..3c7ba82 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
@@ -37,11 +37,10 @@ static void _rtl8723be_return_beacon_queue_skb(struct ieee80211_hw *hw)
                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
                struct sk_buff *skb = __skb_dequeue(&ring->queue);
 
-               pci_unmap_single(rtlpci->pdev,
-                                rtlpriv->cfg->ops->get_desc(
-                                hw,
-                                (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
-                                skb->len, PCI_DMA_TODEVICE);
+               dma_unmap_single(&rtlpci->pdev->dev,
+                                rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
+                                               true, HW_DESC_TXBUFF_ADDR),
+                                skb->len, DMA_TO_DEVICE);
                kfree_skb(skb);
                ring->idx = (ring->idx + 1) % ring->entries;
        }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
index 9ab0e30..559ab78 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
@@ -442,9 +442,9 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                memset(skb->data, 0, EM_HDR_LEN);
        }
        buf_len = skb->len;
-       mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
-                                PCI_DMA_TODEVICE);
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       mapping = dma_map_single(&rtlpci->pdev->dev, skb->data, skb->len,
+                                DMA_TO_DEVICE);
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE, "DMA mapping error\n");
                return;
        }
@@ -595,11 +595,10 @@ void rtl8723be_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc8,
        u8 fw_queue = QSLT_BEACON;
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
index 0212a85..b2e5b9f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -33,11 +33,10 @@ static void _rtl8821ae_return_beacon_queue_skb(struct ieee80211_hw *hw)
                struct rtl_tx_desc *entry = &ring->desc[ring->idx];
                struct sk_buff *skb = __skb_dequeue(&ring->queue);
 
-               pci_unmap_single(rtlpci->pdev,
-                                rtlpriv->cfg->ops->get_desc(
-                                hw,
-                                (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
-                                skb->len, PCI_DMA_TODEVICE);
+               dma_unmap_single(&rtlpci->pdev->dev,
+                                rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
+                                               true, HW_DESC_TXBUFF_ADDR),
+                                skb->len, DMA_TO_DEVICE);
                kfree_skb(skb);
                ring->idx = (ring->idx + 1) % ring->entries;
        }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
index c0f298c..9d6f8dc 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
@@ -693,9 +693,9 @@ void rtl8821ae_tx_fill_desc(struct ieee80211_hw *hw,
                memset(skb->data, 0, EM_HDR_LEN);
        }
        buf_len = skb->len;
-       mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
-                                PCI_DMA_TODEVICE);
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       mapping = dma_map_single(&rtlpci->pdev->dev, skb->data, skb->len,
+                                DMA_TO_DEVICE);
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;
@@ -837,11 +837,10 @@ void rtl8821ae_tx_fill_cmddesc(struct ieee80211_hw *hw,
        u8 fw_queue = QSLT_BEACON;
        __le32 *pdesc = (__le32 *)pdesc8;
 
-       dma_addr_t mapping = pci_map_single(rtlpci->pdev,
-                                           skb->data, skb->len,
-                                           PCI_DMA_TODEVICE);
+       dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
+                                           skb->len, DMA_TO_DEVICE);
 
-       if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
+       if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
                rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
                        "DMA mapping error\n");
                return;