From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, rt2400-devel@lists.sourceforge.net
Subject: [PATCH 11/16] rt2x00: Pass dev_state to rt2x00lib_toggle_rx
Date: Sat, 6 Oct 2007 14:16:09 +0200 [thread overview]
Message-ID: <200710061416.10268.IvDoorn@gmail.com> (raw)
In-Reply-To: <200710061410.31765.IvDoorn@gmail.com>
Directly pass a value from the enum dev_state with rt2x00lib_toggle_rx,
this will save us a ? : statement, and it is clearer then passing a 1 0
argument.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
drivers/net/wireless/rt2x00/rt2x00dev.c | 13 ++++++-------
drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 6dc4f63..e141048 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -120,7 +120,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
/*
* Enable RX.
*/
- rt2x00lib_toggle_rx(rt2x00dev, 1);
+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
/*
* Start the TX queues.
@@ -151,7 +151,7 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
/*
* Disable RX.
*/
- rt2x00lib_toggle_rx(rt2x00dev, 0);
+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
/*
* Disable radio.
@@ -159,14 +159,12 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_OFF);
}
-void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, int enable)
+void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state)
{
- enum dev_state state = enable ? STATE_RADIO_RX_ON : STATE_RADIO_RX_OFF;
-
/*
* When we are disabling the RX, we should also stop the link tuner.
*/
- if (!enable)
+ if (state == STATE_RADIO_RX_OFF)
rt2x00lib_stop_link_tuner(rt2x00dev);
rt2x00dev->ops->lib->set_device_state(rt2x00dev, state);
@@ -174,7 +172,8 @@ void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, int enable)
/*
* When we are enabling the RX, we should also start the link tuner.
*/
- if (enable && is_interface_present(&rt2x00dev->interface))
+ if (state == STATE_RADIO_RX_ON &&
+ is_interface_present(&rt2x00dev->interface))
rt2x00lib_start_link_tuner(rt2x00dev);
}
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 29ca932..298faa9 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -38,7 +38,7 @@
*/
int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev);
void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev);
-void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, int enable);
+void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state);
void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev);
/*
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index e98d013..f519d73 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -272,7 +272,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
if (!conf->radio_enabled)
rt2x00lib_disable_radio(rt2x00dev);
else
- rt2x00lib_toggle_rx(rt2x00dev, 0);
+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
}
rt2x00lib_config(rt2x00dev, conf, 0);
@@ -281,7 +281,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
* Reenable RX only if the radio should be on.
*/
if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
- rt2x00lib_toggle_rx(rt2x00dev, 1);
+ rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
else if (conf->radio_enabled)
return rt2x00lib_enable_radio(rt2x00dev);
--
1.5.3.4
next prev parent reply other threads:[~2007-10-06 12:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200710061410.31765.IvDoorn@gmail.com>
2007-10-06 12:11 ` [PATCH 01/16] rt2x00: Remove duplicate code in MAC & BSSID handling Ivo van Doorn
2007-10-06 12:12 ` [PATCH 02/16] rt2x00: Remove radio check from rt2x00lib_toggle_rx Ivo van Doorn
2007-10-06 12:12 ` [PATCH 03/16] rt2x00: Store "STARTED" state during suspend Ivo van Doorn
2007-10-06 12:13 ` [PATCH 04/16] rt2x00: Move rt2x00dev flags into enumeration Ivo van Doorn
2007-10-06 12:13 ` [PATCH 05/16] rt2x00: Don't use changed_flags inside configure_packet_filter Ivo van Doorn
2007-10-06 12:14 ` [PATCH 06/16] rt2x00: Fix rfkill handling Ivo van Doorn
2007-10-06 12:14 ` [PATCH 07/16] rt2x00: Move TSF sync values into rt2x00config Ivo van Doorn
2007-10-06 12:14 ` [PATCH 08/16] rt2x00: get_duration expects values in 100kbs Ivo van Doorn
2007-10-06 12:15 ` [PATCH 09/16] rt2x00: Cut lines down to 80 characters Ivo van Doorn
2007-10-06 12:15 ` [PATCH 10/16] rt2x00: Add get_tx_data_len callback function Ivo van Doorn
2007-10-06 12:16 ` Ivo van Doorn [this message]
2007-10-06 12:16 ` [PATCH 12/16] rt2x00: Small optimizations Ivo van Doorn
2007-10-06 12:17 ` [PATCH 13/16] rt2x00: Reorganize configuration handler Ivo van Doorn
2007-10-06 12:18 ` [PATCH 14/16] rt2x00: Clean disabling of rt73usb_get_tsf Ivo van Doorn
2007-10-06 12:18 ` [PATCH 15/16] rt2x00: Allways memset memory obtained from skb_push() Ivo van Doorn
2007-10-06 12:18 ` [PATCH 16/16] rt2x00: Release 2.0.10 Ivo van Doorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200710061416.10268.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rt2400-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.