From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: Jiri Benc <jbenc@suse.cz>, Michael Wu <flamingice@sourmilk.net>,
linux-wireless@vger.kernel.org
Subject: [PATCH 18/20] mac80211, drivers: remove reset callback
Date: Wed, 15 Aug 2007 16:49:38 +0200 [thread overview]
Message-ID: <20070815145049.384297000@sipsolutions.net> (raw)
In-Reply-To: 20070815144920.135826000@sipsolutions.net
The callback isn't used so remove it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
drivers/net/wireless/adm8211.c | 38 --------------------------------------
drivers/net/wireless/b43/main.c | 18 ------------------
drivers/net/wireless/rt2400pci.c | 1 -
drivers/net/wireless/rt2500pci.c | 1 -
drivers/net/wireless/rt2500usb.c | 1 -
drivers/net/wireless/rt2x00mac.c | 1 -
drivers/net/wireless/rt61pci.c | 1 -
drivers/net/wireless/rt73usb.c | 1 -
include/net/mac80211.h | 3 ---
9 files changed, 65 deletions(-)
--- wireless-dev.orig/include/net/mac80211.h 2007-08-15 14:19:48.856516958 +0200
+++ wireless-dev/include/net/mac80211.h 2007-08-15 14:26:51.666516958 +0200
@@ -551,9 +551,6 @@ struct ieee80211_ops {
int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb,
struct ieee80211_tx_control *control);
- /* Handler for performing hardware reset. */
- int (*reset)(struct ieee80211_hw *hw);
-
/* Handler that is called when any netdevice attached to the hardware
* device is set UP for the first time. This can be used, e.g., to
* enable interrupts and beacon sending. */
--- wireless-dev.orig/drivers/net/wireless/adm8211.c 2007-08-15 14:04:47.026516958 +0200
+++ wireless-dev/drivers/net/wireless/adm8211.c 2007-08-15 14:26:51.696516958 +0200
@@ -1643,43 +1643,6 @@ static int adm8211_stop(struct ieee80211
return 0;
}
-static int adm8211_reset(struct ieee80211_hw *dev)
-{
- struct adm8211_priv *priv = dev->priv;
- int retval = 0;
-
- priv->nar = 0;
- ADM8211_CSR_WRITE(NAR, 0);
- ADM8211_CSR_WRITE(IER, 0);
- ADM8211_CSR_READ(NAR);
-
- adm8211_free_rings(dev);
-
- retval = adm8211_hw_reset(dev);
- if (retval) {
- printk(KERN_ERR "%s: hardware reset failed\n",
- wiphy_name(dev->wiphy));
- goto fail;
- }
-
- retval = adm8211_init_rings(dev);
- if (retval) {
- printk(KERN_ERR "%s: failed to initialize rings\n",
- wiphy_name(dev->wiphy));
- goto fail;
- }
-
- adm8211_hw_init(dev);
- adm8211_rf_set_channel(dev, priv->channel);
-
- ADM8211_CSR_WRITE(IER, ADM8211_INTMASK);
- adm8211_update_mode(dev);
- ADM8211_CSR_WRITE(RDR, 0);
-
-fail:
- return retval;
-}
-
static void adm8211_calc_durations(int *dur, int *plcp, size_t payload_len, int len,
int plcp_signal, int short_preamble)
{
@@ -1878,7 +1841,6 @@ static int adm8211_alloc_rings(struct ie
static const struct ieee80211_ops adm8211_ops = {
.tx = adm8211_tx,
- .reset = adm8211_reset,
.open = adm8211_open,
.stop = adm8211_stop,
.add_interface = adm8211_add_interface,
--- wireless-dev.orig/drivers/net/wireless/b43/main.c 2007-08-15 14:04:42.366516958 +0200
+++ wireless-dev/drivers/net/wireless/b43/main.c 2007-08-15 14:26:51.706516958 +0200
@@ -2536,23 +2536,6 @@ static int b43_get_stats(struct ieee8021
return 0;
}
-static int b43_dev_reset(struct ieee80211_hw *hw)
-{
- struct b43_wl *wl = hw_to_b43_wl(hw);
- struct b43_wldev *dev;
- int err = -ENODEV;
-
- mutex_lock(&wl->mutex);
- dev = wl->current_dev;
- if (dev) {
- b43_controller_restart(dev, "Reset by ieee80211 subsystem");
- err = 0;
- }
- mutex_unlock(&wl->mutex);
-
- return 0;
-}
-
static const char *phymode_to_string(unsigned int phymode)
{
switch (phymode) {
@@ -3485,7 +3468,6 @@ static const struct ieee80211_ops b43_hw
.conf_tx = b43_conf_tx,
.add_interface = b43_add_interface,
.remove_interface = b43_remove_interface,
- .reset = b43_dev_reset,
.config = b43_dev_config,
.config_interface = b43_config_interface,
.set_multicast_list = b43_set_multicast_list,
--- wireless-dev.orig/drivers/net/wireless/rt2400pci.c 2007-08-15 14:04:41.066516958 +0200
+++ wireless-dev/drivers/net/wireless/rt2400pci.c 2007-08-15 14:26:51.706516958 +0200
@@ -1589,7 +1589,6 @@ static int rt2400pci_tx_last_beacon(stru
static const struct ieee80211_ops rt2400pci_mac80211_ops = {
.tx = rt2x00mac_tx,
- .reset = rt2x00mac_reset,
.add_interface = rt2x00mac_add_interface,
.remove_interface = rt2x00mac_remove_interface,
.config = rt2x00mac_config,
--- wireless-dev.orig/drivers/net/wireless/rt2500pci.c 2007-08-15 14:04:41.126516958 +0200
+++ wireless-dev/drivers/net/wireless/rt2500pci.c 2007-08-15 14:26:51.706516958 +0200
@@ -1824,7 +1824,6 @@ static int rt2500pci_tx_last_beacon(stru
static const struct ieee80211_ops rt2500pci_mac80211_ops = {
.tx = rt2x00mac_tx,
- .reset = rt2x00mac_reset,
.add_interface = rt2x00mac_add_interface,
.remove_interface = rt2x00mac_remove_interface,
.config = rt2x00mac_config,
--- wireless-dev.orig/drivers/net/wireless/rt2500usb.c 2007-08-15 14:04:41.156516958 +0200
+++ wireless-dev/drivers/net/wireless/rt2500usb.c 2007-08-15 14:26:51.726516958 +0200
@@ -1512,7 +1512,6 @@ static int rt2500usb_probe_hw(struct rt2
*/
static const struct ieee80211_ops rt2500usb_mac80211_ops = {
.tx = rt2x00mac_tx,
- .reset = rt2x00mac_reset,
.add_interface = rt2x00mac_add_interface,
.remove_interface = rt2x00mac_remove_interface,
.config = rt2x00mac_config,
--- wireless-dev.orig/drivers/net/wireless/rt2x00mac.c 2007-08-15 14:04:41.176516958 +0200
+++ wireless-dev/drivers/net/wireless/rt2x00mac.c 2007-08-15 14:26:51.726516958 +0200
@@ -166,7 +166,6 @@ exit:
return retval;
}
-EXPORT_SYMBOL_GPL(rt2x00mac_reset);
int rt2x00mac_add_interface(struct ieee80211_hw *hw,
struct ieee80211_if_init_conf *conf)
--- wireless-dev.orig/drivers/net/wireless/rt61pci.c 2007-08-15 14:04:41.246516958 +0200
+++ wireless-dev/drivers/net/wireless/rt61pci.c 2007-08-15 14:26:51.726516958 +0200
@@ -2340,7 +2340,6 @@ static void rt61pci_reset_tsf(struct iee
static const struct ieee80211_ops rt61pci_mac80211_ops = {
.tx = rt2x00mac_tx,
- .reset = rt2x00mac_reset,
.add_interface = rt2x00mac_add_interface,
.remove_interface = rt2x00mac_remove_interface,
.config = rt2x00mac_config,
--- wireless-dev.orig/drivers/net/wireless/rt73usb.c 2007-08-15 14:04:41.296516958 +0200
+++ wireless-dev/drivers/net/wireless/rt73usb.c 2007-08-15 14:26:51.736516958 +0200
@@ -1813,7 +1813,6 @@ static void rt73usb_reset_tsf(struct iee
static const struct ieee80211_ops rt73usb_mac80211_ops = {
.tx = rt2x00mac_tx,
- .reset = rt2x00mac_reset,
.add_interface = rt2x00mac_add_interface,
.remove_interface = rt2x00mac_remove_interface,
.config = rt2x00mac_config,
--
next prev parent reply other threads:[~2007-08-15 14:59 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-15 14:49 [PATCH 00/20] reorganised patches Johannes Berg
2007-08-15 14:49 ` [PATCH 01/20] mac80211: fix showing transmitted frames on multiple monitor interfaces Johannes Berg
2007-08-15 14:49 ` [PATCH 02/20] mac80211: remove ieee80211_msg_wep_frame_unknown_key Johannes Berg
2007-08-15 14:49 ` [PATCH 03/20] mac80211: remove radar stuff Johannes Berg
2007-08-15 14:49 ` [PATCH 04/20] cfg80211: extend radiotap parser by all remaining fields Johannes Berg
2007-08-15 14:49 ` [PATCH 05/20] mac80211: remove unused ioctls (1) Johannes Berg
2007-08-18 4:04 ` Jouni Malinen
2007-08-20 9:10 ` Johannes Berg
2007-08-21 3:09 ` Jouni Malinen
2007-08-21 10:14 ` Johannes Berg
2007-08-15 14:49 ` [PATCH 06/20] mac80211: remove PRISM2_PARAM_RADIO_ENABLED Johannes Berg
2007-08-15 14:49 ` [PATCH 07/20] mac80211: remove unused ioctls (2) Johannes Berg
2007-08-18 4:07 ` Jouni Malinen
2007-08-20 9:13 ` Johannes Berg
2007-08-21 3:19 ` Jouni Malinen
2007-08-21 10:12 ` Johannes Berg
2007-08-15 14:49 ` [PATCH 08/20] mac80211: remove unused ioctls (3) Johannes Berg
2007-08-18 4:09 ` Jouni Malinen
2007-08-20 9:15 ` Johannes Berg
2007-08-21 3:13 ` Jouni Malinen
2007-08-15 14:49 ` [PATCH 09/20] mac80211: remove unused ioctls (4) Johannes Berg
2007-08-15 14:49 ` [PATCH 10/20] mac80211: remove unused ioctls (5) Johannes Berg
2007-08-15 14:49 ` [PATCH 11/20] mac80211: remove PRISM2_HOSTAPD_SET_GENERIC_INFO_ELEM Johannes Berg
2007-08-15 14:49 ` [PATCH 12/20] mac80211: fix preamble setting Johannes Berg
2007-08-15 14:49 ` [PATCH 13/20] mac80211: remove scan struct from hostapd_param Johannes Berg
2007-08-15 14:49 ` [PATCH 14/20] mac80211: kill key_mgmt variable, use privacy_enabled Johannes Berg
2007-08-17 1:09 ` Johannes Berg
2007-08-17 11:27 ` [PATCH v2 " Johannes Berg
2007-08-18 3:59 ` [PATCH " Jouni Malinen
2007-08-18 9:03 ` Johannes Berg
2007-08-15 14:49 ` [PATCH 15/20] mac80211: refactor event sending Johannes Berg
2007-08-15 14:49 ` [PATCH 16/20] mac80211: ratelimit some RX messages Johannes Berg
2007-08-15 14:49 ` [PATCH 17/20] mac80211: avoid copying packets to interfaces that are down Johannes Berg
2007-08-16 4:48 ` Michael Wu
2007-08-16 13:14 ` Johannes Berg
2007-08-21 8:50 ` [PATCH 17/20 v2] " Johannes Berg
2007-08-15 14:49 ` Johannes Berg [this message]
2007-08-15 15:00 ` [PATCH 18/20] mac80211, drivers: remove reset callback Michael Buesch
2007-08-15 18:10 ` Ivo van Doorn
2007-08-16 13:14 ` Johannes Berg
2007-08-15 14:49 ` [PATCH 19/20] mac80211: remove IEEE80211_HW_HOST_GEN_BEACON flag Johannes Berg
2007-08-15 14:49 ` [PATCH 20/20] mac80211: remove VLAN stuff Johannes Berg
2007-08-16 15:03 ` Johannes Berg
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=20070815145049.384297000@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=flamingice@sourmilk.net \
--cc=jbenc@suse.cz \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).