From 65322dbcafc9456d124934f1b72f99fd0bcdb0b3 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 21 Jul 2009 14:26:01 +0300 Subject: [PATCH] --- yaml --- r: 159183 b: refs/heads/master c: 270b7588b376968d4db3af01e6d9907814c45552 h: refs/heads/master i: 159181: 255813e4ab638a28a03ce1a2eefb5efd6dd8be41 159179: 46254c09d001dc1d60e53c35318abf63607bdf71 159175: be622244c04d5f0805ea48ed7d5992e0e195ee45 159167: fef3d9609c89108f92384a93f93989ac19d07b05 v: v3 --- [refs] | 2 +- .../drivers/net/wireless/wl12xx/wl1251_main.c | 54 ------------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/[refs] b/[refs] index 27e4067d8937..3d7c7f9e7182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f298c282a5233126ffe6385c02a9e79f695bed0f +refs/heads/master: 270b7588b376968d4db3af01e6d9907814c45552 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c index 509cbef5e271..da4c688c46af 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c @@ -246,60 +246,6 @@ static void wl1251_filter_work(struct work_struct *work) mutex_unlock(&wl->mutex); } -int wl1251_plt_start(struct wl1251 *wl) -{ - int ret; - - mutex_lock(&wl->mutex); - - wl1251_notice("power up"); - - if (wl->state != WL1251_STATE_OFF) { - wl1251_error("cannot go into PLT state because not " - "in off state: %d", wl->state); - return -EBUSY; - } - - wl->state = WL1251_STATE_PLT; - - ret = wl1251_chip_wakeup(wl); - if (ret < 0) - return ret; - - ret = wl->chip.op_boot(wl); - if (ret < 0) - return ret; - - wl1251_notice("firmware booted in PLT mode (%s)", wl->chip.fw_ver); - - ret = wl->chip.op_plt_init(wl); - if (ret < 0) - return ret; - - return 0; -} - -int wl1251_plt_stop(struct wl1251 *wl) -{ - mutex_lock(&wl->mutex); - - wl1251_notice("power down"); - - if (wl->state != WL1251_STATE_PLT) { - wl1251_error("cannot power down because not in PLT " - "state: %d", wl->state); - return -EBUSY; - } - - wl1251_disable_interrupts(wl); - wl1251_power_off(wl); - - wl->state = WL1251_STATE_OFF; - - return 0; -} - - static int wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) { struct wl1251 *wl = hw->priv;