These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8192e / rtl8192e / rtl_pci.c

diff --git a/kernel/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c b/kernel/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
index 51f53be..2ff52e7 100644 (file)
--- a/kernel/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
+++ b/kernel/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
@@ -12,10 +12,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -25,7 +21,7 @@
 #include "rtl_pci.h"
 #include "rtl_core.h"
 
-static void rtl8192_parse_pci_configuration(struct pci_dev *pdev,
+static void _rtl92e_parse_pci_configuration(struct pci_dev *pdev,
                                            struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
@@ -34,10 +30,8 @@ static void rtl8192_parse_pci_configuration(struct pci_dev *pdev,
        u16 LinkCtrlReg;
 
        pcie_capability_read_word(priv->pdev, PCI_EXP_LNKCTL, &LinkCtrlReg);
-       priv->NdisAdapter.LinkCtrlReg = (u8)LinkCtrlReg;
 
-       RT_TRACE(COMP_INIT, "Link Control Register =%x\n",
-                priv->NdisAdapter.LinkCtrlReg);
+       RT_TRACE(COMP_INIT, "Link Control Register =%x\n", LinkCtrlReg);
 
        pci_read_config_byte(pdev, 0x98, &tmp);
        tmp |= BIT4;
@@ -47,7 +41,7 @@ static void rtl8192_parse_pci_configuration(struct pci_dev *pdev,
        pci_write_config_byte(pdev, 0x70f, tmp);
 }
 
-bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)
+bool rtl92e_check_adapter(struct pci_dev *pdev, struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        u16 VenderID;
@@ -62,7 +56,7 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)
 
        priv->card_8192 = priv->ops->nic_type;
 
-       if (DeviceID == 0x8172) {
+       if (DeviceID == 0x8192) {
                switch (RevisionID) {
                case HAL_HW_PCI_REVISION_ID_8192PCIE:
                        dev_info(&pdev->dev,
@@ -94,7 +88,7 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)
                return false;
        }
 
-       rtl8192_parse_pci_configuration(pdev, dev);
+       _rtl92e_parse_pci_configuration(pdev, dev);
 
        return true;
 }