tree eb896a9608da4a175e42279f5d8ffe2d4a3c6c7b
parent 5dc54a65b6981d327a84c7651bbfeef0c0aff977
author Pavel Machek <[EMAIL PROTECTED]> Tue, 21 Jun 2005 04:28:43 -0700
committer Jeff Garzik <[EMAIL PROTECTED]> Tue, 28 Jun 2005 07:26:31 -0400

[PATCH] ipw2100: small cleanups

Fix few typos/thinkos in ipw, remove ugly macro (it is commented around,
anyway), and fix types passed to pci_set_power_state.

Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>

 drivers/net/wireless/ipw2100.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -925,7 +925,7 @@ static int sw_reset_and_clock(struct ipw
 }
 
 /*********************************************************************
-    Procedure   :   ipw2100_ipw2100_download_firmware
+    Procedure   :   ipw2100_download_firmware
     Purpose     :   Initiaze adapter after power on.
                     The sequence is:
                     1. assert s/w reset first!
@@ -1192,7 +1192,6 @@ static int ipw2100_get_hw_features(struc
  */
 static int ipw2100_start_adapter(struct ipw2100_priv *priv)
 {
-#define IPW_WAIT_FW_INIT_COMPLETE_DELAY (40 * HZ / 1000)
        int i;
        u32 inta, inta_mask, gpio;
 
@@ -1229,7 +1228,7 @@ static int ipw2100_start_adapter(struct 
        i = 5000;
        do {
                set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(IPW_WAIT_FW_INIT_COMPLETE_DELAY);
+               schedule_timeout(40 * HZ / 1000);
                /* Todo... wait for sync command ... */
 
                read_register(priv->net_dev, IPW_REG_INTA, &inta);
@@ -1694,7 +1693,7 @@ static int ipw2100_up(struct ipw2100_pri
        } else
                priv->status |= STATUS_POWERED;
 
-       /* Load the firmeware, start the clocks, etc. */
+       /* Load the firmware, start the clocks, etc. */
        if (ipw2100_start_adapter(priv)) {
                IPW_DEBUG_ERROR("%s: Failed to start the firmware.\n",
                                priv->net_dev->name);
@@ -6498,7 +6497,7 @@ static int ipw2100_pci_init_one(struct p
        if ((val & 0x0000ff00) != 0)
                pci_write_config_dword(pci_dev, 0x40, val & 0xffff00ff);
 
-       pci_set_power_state(pci_dev, 0);
+       pci_set_power_state(pci_dev, PCI_D0);
 
        if (!ipw2100_hw_is_adapter_in_system(dev)) {
                printk(KERN_WARNING DRV_NAME
@@ -8034,7 +8033,7 @@ static iw_handler ipw2100_wx_handlers[] 
         ipw2100_wx_set_wap,       /* SIOCSIWAP */
         ipw2100_wx_get_wap,       /* SIOCGIWAP */
         NULL,                     /* -- hole -- */
-        NULL,                     /* SIOCGIWAPLIST -- depricated */
+        NULL,                     /* SIOCGIWAPLIST -- deprecated */
         ipw2100_wx_set_scan,      /* SIOCSIWSCAN */
         ipw2100_wx_get_scan,      /* SIOCGIWSCAN */
         ipw2100_wx_set_essid,     /* SIOCSIWESSID */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to