Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rt2860 / pci_main_dev.c

diff --git a/drivers/staging/rt2860/pci_main_dev.c b/drivers/staging/rt2860/pci_main_dev.c
index 321facd6b0abf3621455f6718a9bec6951bf529e..25fbb1880ff2837d1d1a8d0899aa77a61d7dd577 100644 (file)
--- a/drivers/staging/rt2860/pci_main_dev.c
+++ b/drivers/staging/rt2860/pci_main_dev.c
@@ -31,7 +31,8 @@
     Create and register network interface for PCI based chipsets in Linux platform.
 
     Revision History:
-    Who         When            What
+    Who                When            What
+    Justin P. Mattock  11/07/2010      Fix typos in some comments
     --------    ----------      ----------------------------------------------
 */
 
@@ -40,8 +41,8 @@
 #include <linux/slab.h>
 
 /* Following information will be show when you run 'modinfo' */
-/* *** If you have a solution for the bug in current version of driver, please mail to me. */
-/* Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. *** */
+/* If you have a solution for a bug in current version of driver, please e-mail me. */
+/* Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. */
 MODULE_AUTHOR("Jett Chen <jett_chen@ralinktech.com>");
 MODULE_DESCRIPTION("RT2860/RT3090 Wireless Lan Linux Driver");
 MODULE_LICENSE("GPL");
@@ -50,9 +51,6 @@ MODULE_ALIAS("rt3090sta");
 /* */
 /* Function declarations */
 /* */
-extern int rt28xx_close(IN struct net_device *net_dev);
-extern int rt28xx_open(struct net_device *net_dev);
-
 static void __devexit rt2860_remove_one(struct pci_dev *pci_dev);
 static int __devinit rt2860_probe(struct pci_dev *pci_dev,
                                  const struct pci_device_id *ent);
@@ -205,7 +203,7 @@ static int rt2860_resume(struct pci_dev *pci_dev)
 
        /* initialize device before it's used by a driver */
        if (pci_enable_device(pci_dev)) {
-               printk("pci enable fail!\n");
+               printk(KERN_ERR "rt2860: pci enable fail!\n");
                return 0;
        }
 
@@ -599,7 +597,7 @@ void RTMPInitPCIeLinkCtrlValue(struct rt_rtmp_adapter *pAd)
                DBGPRINT_RAW(RT_DEBUG_ERROR,
                             (" AUX_CTRL = 0x%32x\n", MacValue));
 
-               /* for RT30xx F and after, PCIe infterface, and for power solution 3 */
+               /* for RT30xx F and after, PCIe interface, and for power solution 3 */
                if ((IS_VERSION_AFTER_F(pAd))
                    && (pAd->StaCfg.PSControl.field.rt30xxPowerMode >= 2)
                    && (pAd->StaCfg.PSControl.field.rt30xxPowerMode <= 3)) {
@@ -902,7 +900,7 @@ void RTMPPCIeLinkCtrlValueRestore(struct rt_rtmp_adapter *pAd, u8 Level)
                                  Configuration);
                if ((Configuration != 0) && (Configuration != 0xFFFF)) {
                        Configuration &= 0xfefc;
-                       /* If call from interface down, restore to orginial setting. */
+                       /* If call from interface down, restore to original setting. */
                        if (Level == RESTORE_CLOSE)
                                Configuration |= pAd->HostLnkCtrlConfiguration;
                        else
@@ -924,7 +922,7 @@ void RTMPPCIeLinkCtrlValueRestore(struct rt_rtmp_adapter *pAd, u8 Level)
                                  Configuration);
                if ((Configuration != 0) && (Configuration != 0xFFFF)) {
                        Configuration &= 0xfefc;
-                       /* If call from interface down, restore to orginial setting. */
+                       /* If call from interface down, restore to original setting. */
                        if (Level == RESTORE_CLOSE)
                                Configuration |= pAd->RLnkCtrlConfiguration;
                        else
@@ -1106,12 +1104,12 @@ void RTMPrt3xSetPCIePowerLinkCtrl(struct rt_rtmp_adapter *pAd)
                if (pos != 0)
                        pAd->HostLnkCtrlOffset = pos + PCI_EXP_LNKCTL;
 
-               /* If configurared to turn on L1. */
+               /* If configured to turn on L1. */
                HostConfiguration = 0;
                if (pAd->StaCfg.PSControl.field.rt30xxForceASPMTest == 1) {
                        DBGPRINT(RT_DEBUG_TRACE, ("Enter,PSM : Force ASPM\n"));
 
-                       /* Skip non-exist deice right away */
+                       /* Skip non-exist device right away */
                        if ((pAd->HostLnkCtrlOffset != 0)) {
                                PCI_REG_READ_WORD(pObj->parent_pci_dev,
                                                  pAd->HostLnkCtrlOffset,