Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b31d8b90dcc6fbe39147863d13b93a8d49d2b341
Commit:     b31d8b90dcc6fbe39147863d13b93a8d49d2b341
Parent:     14e865ba5d9e9adc90363e572743ac238935ba38
Author:     David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 10 15:25:42 2007 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:06:36 2008 -0800

    libertas: remove pre_open_check()
    
    The firmware is always initialised before we register the netdevices.
    It's not possible for pre_open_check() to fail.
    
    One day we might try loading firmware in ->open(), but still it won't be
    just a _check_, like this.
    
    Signed-off-by: David Woodhouse <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/main.c |   32 --------------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/drivers/net/wireless/libertas/main.c 
b/drivers/net/wireless/libertas/main.c
index 2797149..3d9de7a 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -367,34 +367,6 @@ static struct attribute_group lbs_mesh_attr_group = {
 };
 
 /**
- *  @brief Check if the device can be open and wait if necessary.
- *
- *  @param dev     A pointer to net_device structure
- *  @return       0
- *
- * For USB adapter, on some systems the device open handler will be
- * called before FW ready. Use the following flag check and wait
- * function to work around the issue.
- *
- */
-static int pre_open_check(struct net_device *dev)
-{
-       struct lbs_private *priv = (struct lbs_private *) dev->priv;
-       int i = 0;
-
-       while (!priv->fw_ready && i < 20) {
-               i++;
-               msleep_interruptible(100);
-       }
-       if (!priv->fw_ready) {
-               lbs_pr_err("firmware not ready\n");
-               return -1;
-       }
-
-       return 0;
-}
-
-/**
  *  @brief This function opens the device
  *
  *  @param dev     A pointer to net_device structure
@@ -433,8 +405,6 @@ static int lbs_mesh_open(struct net_device *dev)
 {
        struct lbs_private *priv = (struct lbs_private *) dev->priv ;
 
-       if (pre_open_check(dev) == -1)
-               return -1;
        priv->mesh_open = 1 ;
        netif_wake_queue(priv->mesh_dev);
 
@@ -457,8 +427,6 @@ static int lbs_open(struct net_device *dev)
 {
        struct lbs_private *priv = (struct lbs_private *) dev->priv ;
 
-       if(pre_open_check(dev) == -1)
-               return -1;
        priv->infra_open = 1 ;
        netif_wake_queue(priv->dev);
        if (priv->open == 0)
-
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