---

yaml
---
r: 267910
b: refs/heads/master
c: 62f27cc
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f38d223b692742e77c70033d145245615c8f3aa5
+refs/heads/master: 62f27cc4ae4183e9ee4e562eae60101966014f58

trunk/drivers/staging/rtl8192e/rtl_pci.c

@@ -25,7 +25,8 @@
 #include "rtl_pci.h"
 #include "rtl_core.h"
 
-static void rtl8192_parse_pci_configuration(struct pci_dev *pdev, struct net_device *dev)
+static void rtl8192_parse_pci_configuration(struct pci_dev *pdev,
+					    struct net_device *dev)
 {
 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -37,10 +38,11 @@ static void rtl8192_parse_pci_configuration(struct pci_dev *pdev, struct net_dev
 	pci_read_config_byte(priv->pdev, pos + PCI_EXP_LNKCTL, &LinkCtrlReg);
 	priv->NdisAdapter.LinkCtrlReg = LinkCtrlReg;
 
-	RT_TRACE(COMP_INIT, "Link Control Register =%x\n", priv->NdisAdapter.LinkCtrlReg);
+	RT_TRACE(COMP_INIT, "Link Control Register =%x\n",
+		 priv->NdisAdapter.LinkCtrlReg);
 
 	pci_read_config_byte(pdev, 0x98, &tmp);
-	tmp |=BIT4;
+	tmp |= BIT4;
 	pci_write_config_byte(pdev, 0x98, tmp);
 
 	tmp = 0x17;
@@ -65,24 +67,27 @@ bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev)
 	if (DeviceID == 0x8172) {
 		switch (RevisionID) {
 		case HAL_HW_PCI_REVISION_ID_8192PCIE:
-			printk("Adapter(8192 PCI-E) is found - DeviceID=%x\n", DeviceID);
+			printk(KERN_INFO "Adapter(8192 PCI-E) is found - "
+			       "DeviceID=%x\n", DeviceID);
 			priv->card_8192 = NIC_8192E;
 			break;
 		case HAL_HW_PCI_REVISION_ID_8192SE:
-			printk("Adapter(8192SE) is found - DeviceID=%x\n", DeviceID);
+			printk(KERN_INFO "Adapter(8192SE) is found - "
+			       "DeviceID=%x\n", DeviceID);
 			priv->card_8192 = NIC_8192SE;
 			break;
 		default:
-			printk("UNKNOWN nic type(%4x:%4x)\n", pdev->vendor, pdev->device);
+			printk(KERN_INFO "UNKNOWN nic type(%4x:%4x)\n",
+			       pdev->vendor, pdev->device);
 			priv->card_8192 = NIC_UNKNOWN;
 			return false;
 		}
 	}
 
 	if (priv->ops->nic_type != priv->card_8192) {
-		printk("Detect info(%x) and hardware info(%x) not match!\n",
+		printk(KERN_INFO "Detect info(%x) and hardware info(%x) not match!\n",
 				priv->ops->nic_type, priv->card_8192);
-		printk("Please select proper driver before install!!!!\n");
+		printk(KERN_INFO "Please select proper driver before install!!!!\n");
 		return false;
 	}
 

trunk/drivers/staging/rtl8192e/rtl_pci.h

@@ -69,11 +69,11 @@ struct mp_adapter {
 	u16		PciBridgeDeviceId;
 	u8		PciBridgePCIeHdrOffset;
 	u8		PciBridgeLinkCtrlReg;
-};//,*pmp_adapter;
+};
 
 struct rt_pci_capab_header {
-    unsigned char   CapabilityID;
-    unsigned char   Next;
+	unsigned char   CapabilityID;
+	unsigned char   Next;
 };
 
 #define PCI_MAX_BRIDGE_NUMBER				255