Commit 644aa4d6 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: remove list of IEEE 802.11 devices 



This is the first step to remove leftover code.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8f15e287

drivers/net/wireless/b43/b43.h

+0 −4
Original line number Diff line number Diff line
@@ -915,10 +915,6 @@ struct b43_wl { 
	char rng_name[30 + 1];

#endif /* CONFIG_B43_HWRNG */



	/* List of all wireless devices on this chip */

	struct list_head devlist;

	u8 nr_devs;



	bool radiotap_enabled;

	bool radio_enabled;

drivers/net/wireless/b43/main.c

+19 −33
Original line number Diff line number Diff line
@@ -3735,23 +3735,21 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan) 
{

	struct b43_wldev *up_dev = NULL;

	struct b43_wldev *down_dev;

	struct b43_wldev *d;

	int err;

	bool uninitialized_var(gmode);

	int prev_status;



	/* Find a device and PHY which supports the band. */

	list_for_each_entry(d, &wl->devlist, list) {

	switch (chan->band) {

	case IEEE80211_BAND_5GHZ:

			if (d->phy.supports_5ghz) {

				up_dev = d;

		if (wl->current_dev->phy.supports_5ghz) {

			up_dev = wl->current_dev;

			gmode = false;

		}

		break;

	case IEEE80211_BAND_2GHZ:

			if (d->phy.supports_2ghz) {

				up_dev = d;

		if (wl->current_dev->phy.supports_2ghz) {

			up_dev = wl->current_dev;

			gmode = true;

		}

		break;
@@ -3759,16 +3757,13 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan) 
		B43_WARN_ON(1);

		return -EINVAL;

	}

		if (up_dev)

			break;

	}



	if (!up_dev) {

		b43err(wl, "Could not find a device for %s-GHz band operation\n",

		       band_to_string(chan->band));

		return -ENODEV;

	}

	if ((up_dev == wl->current_dev) &&

	    (!!wl->current_dev->phy.gmode == !!gmode)) {

	if (!!wl->current_dev->phy.gmode == !!gmode) {

		/* This device is already running. */

		return 0;

	}
@@ -5270,7 +5265,6 @@ static void b43_one_core_detach(struct b43_bus_dev *dev) 
	b43_debugfs_remove_device(wldev);

	b43_wireless_core_detach(wldev);

	list_del(&wldev->list);

	wl->nr_devs--;

	b43_bus_set_wldev(dev, NULL);

	kfree(wldev);

}
@@ -5295,8 +5289,6 @@ static int b43_one_core_attach(struct b43_bus_dev *dev, struct b43_wl *wl) 
	if (err)

		goto err_kfree_wldev;



	list_add(&wldev->list, &wl->devlist);

	wl->nr_devs++;

	b43_bus_set_wldev(dev, wldev);

	b43_debugfs_add_device(wldev);
@@ -5386,7 +5378,6 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev) 
	wl->hw = hw;

	mutex_init(&wl->mutex);

	spin_lock_init(&wl->hardirq_lock);

	INIT_LIST_HEAD(&wl->devlist);

	INIT_WORK(&wl->beacon_update_trigger, b43_beacon_update_trigger_work);

	INIT_WORK(&wl->txpower_adjust_work, b43_phy_txpower_adjust_work);

	INIT_WORK(&wl->tx_work, b43_tx_work);
@@ -5549,14 +5540,9 @@ static void b43_ssb_remove(struct ssb_device *sdev) 
	/* Unregister HW RNG driver */

	b43_rng_exit(wl);



	if (list_empty(&wl->devlist)) {

	b43_leds_unregister(wl);

		/* Last core on the chip unregistered.

		 * We can destroy common struct b43_wl.

		 */

	b43_wireless_exit(dev, wl);

}

}



static struct ssb_driver b43_ssb_driver = {

	.name		= KBUILD_MODNAME,