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

   1 From d9de1941802e3887251f8f6d519ff17d5fafc516 Mon Sep 17 00:00:00 2001
   2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
   3 Date: Wed, 20 Jul 2016 15:34:59 -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 ---
  12  .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 30 ++--------------------
  13  1 file changed, 2 insertions(+), 28 deletions(-)
  14
  15 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  16 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
  17 @@ -3847,28 +3847,6 @@ void rtl8xxxu_gen2_disable_rf(struct rtl
  18         rtl8xxxu_write32(priv, REG_RX_WAIT_CCA, val32);
  19  }
  20
  21 -static void rtl8xxxu_old_init_queue_reserved_page(struct rtl8xxxu_priv *priv)
  22 -{
  23 -       u8 val8;
  24 -       u32 val32;
  25 -
  26 -       if (priv->ep_tx_normal_queue)
  27 -               val8 = TX_PAGE_NUM_NORM_PQ;
  28 -       else
  29 -               val8 = 0;
  30 -
  31 -       rtl8xxxu_write8(priv, REG_RQPN_NPQ, val8);
  32 -
  33 -       val32 = (TX_PAGE_NUM_PUBQ << RQPN_PUB_PQ_SHIFT) | RQPN_LOAD;
  34 -
  35 -       if (priv->ep_tx_high_queue)
  36 -               val32 |= (TX_PAGE_NUM_HI_PQ << RQPN_HI_PQ_SHIFT);
  37 -       if (priv->ep_tx_low_queue)
  38 -               val32 |= (TX_PAGE_NUM_LO_PQ << RQPN_LO_PQ_SHIFT);
  39 -
  40 -       rtl8xxxu_write32(priv, REG_RQPN, val32);
  41 -}
  42 -
  43  static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv)
  44  {
  45         struct rtl8xxxu_fileops *fops = priv->fops;
  46 @@ -3929,12 +3907,8 @@ static int rtl8xxxu_init_device(struct i
  47                 goto exit;
  48         }
  49
  50 -       if (!macpower) {
  51 -               if (priv->fops->total_page_num)
  52 -                       rtl8xxxu_init_queue_reserved_page(priv);
  53 -               else
  54 -                       rtl8xxxu_old_init_queue_reserved_page(priv);
  55 -       }
  56 +       if (!macpower)
  57 +               rtl8xxxu_init_queue_reserved_page(priv);
  58
  59         ret = rtl8xxxu_init_queue_priority(priv);
  60         dev_dbg(dev, "%s: init_queue_priority %i\n", __func__, ret);