package/kernel/mac80211/patches/653-0008-rtl8xxxu-Remove-now-obsolete-rtl8xxxu_old_init_queue.patch

   1 From efeb8ce7a98cfb60932c6a53ce86359bf6b33b67 Mon Sep 17 00:00:00 2001
   2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
   3 Date: Fri, 19 Aug 2016 17:46:30 -0400
   4 Subject: [PATCH] rtl8xxxu: Remove now obsolete
   5  rtl8xxxu_old_init_queue_reserved_page()
   6
   7 Switching over the old devices to use the new function allows us to
   8 get rid of this legacy.
   9
  10 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
  11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  12 ---
  13  .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 30 ++--------------------
  14  1 file changed, 2 insertions(+), 28 deletions(-)
  15
  16 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  17 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  18 @@ -3847,28 +3847,6 @@ void rtl8xxxu_gen2_disable_rf(struct rtl
  19         rtl8xxxu_write32(priv, REG_RX_WAIT_CCA, val32);
  20  }
  21
  22 -static void rtl8xxxu_old_init_queue_reserved_page(struct rtl8xxxu_priv *priv)
  23 -{
  24 -       u8 val8;
  25 -       u32 val32;
  26 -
  27 -       if (priv->ep_tx_normal_queue)
  28 -               val8 = TX_PAGE_NUM_NORM_PQ;
  29 -       else
  30 -               val8 = 0;
  31 -
  32 -       rtl8xxxu_write8(priv, REG_RQPN_NPQ, val8);
  33 -
  34 -       val32 = (TX_PAGE_NUM_PUBQ << RQPN_PUB_PQ_SHIFT) | RQPN_LOAD;
  35 -
  36 -       if (priv->ep_tx_high_queue)
  37 -               val32 |= (TX_PAGE_NUM_HI_PQ << RQPN_HI_PQ_SHIFT);
  38 -       if (priv->ep_tx_low_queue)
  39 -               val32 |= (TX_PAGE_NUM_LO_PQ << RQPN_LO_PQ_SHIFT);
  40 -
  41 -       rtl8xxxu_write32(priv, REG_RQPN, val32);
  42 -}
  43 -
  44  static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv)
  45  {
  46         struct rtl8xxxu_fileops *fops = priv->fops;
  47 @@ -3929,12 +3907,8 @@ static int rtl8xxxu_init_device(struct i
  48                 goto exit;
  49         }
  50
  51 -       if (!macpower) {
  52 -               if (priv->fops->total_page_num)
  53 -                       rtl8xxxu_init_queue_reserved_page(priv);
  54 -               else
  55 -                       rtl8xxxu_old_init_queue_reserved_page(priv);
  56 -       }
  57 +       if (!macpower)
  58 +               rtl8xxxu_init_queue_reserved_page(priv);
  59
  60         ret = rtl8xxxu_init_queue_priority(priv);
  61         dev_dbg(dev, "%s: init_queue_priority %i\n", __func__, ret);