Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0541ac4c authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

b43legacy: Fix warnings from gcc 4.6.0 



gcc 4.6.0 warnings for b43legacy:

  CC [M]  drivers/net/wireless/b43legacy/main.o
drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_request_firmware’:
drivers/net/wireless/b43legacy/main.c:1567:6: warning: variable ‘tmshigh’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_op_dev_config’:
drivers/net/wireless/b43legacy/main.c:2637:6: warning: variable ‘antenna_rx’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_op_bss_info_changed’:
drivers/net/wireless/b43legacy/main.c:2778:24: warning: variable ‘phy’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/xmit.c: In function ‘generate_txhdr_fw3’:
drivers/net/wireless/b43legacy/xmit.c:324:7: warning: variable ‘rts_rate_ofdm’ set but not used [-Wunused-but-set-variable]
  CC [M]  drivers/net/wireless/b43legacy/dma.o
drivers/net/wireless/b43legacy/dma.c: In function ‘free_all_descbuffers’:
drivers/net/wireless/b43legacy/dma.c:820:36: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/dma.c: In function ‘b43legacy_dma_tx’:
drivers/net/wireless/b43legacy/dma.c:1377:28: warning: variable ‘info’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/dma.c:1374:24: warning: variable ‘hdr’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/dma.c: In function ‘b43legacy_dma_handle_txstatus’:
drivers/net/wireless/b43legacy/dma.c:1438:36: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable]

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 78d57372

drivers/net/wireless/b43legacy/dma.c

+2 −8
Original line number Diff line number Diff line
@@ -817,14 +817,13 @@ static void dmacontroller_cleanup(struct b43legacy_dmaring *ring) 


static void free_all_descbuffers(struct b43legacy_dmaring *ring)

{

	struct b43legacy_dmadesc_generic *desc;

	struct b43legacy_dmadesc_meta *meta;

	int i;



	if (!ring->used_slots)

		return;

	for (i = 0; i < ring->nr_slots; i++) {

		desc = ring->ops->idx2desc(ring, i, &meta);

		ring->ops->idx2desc(ring, i, &meta);



		if (!meta->skb) {

			B43legacy_WARN_ON(!ring->tx);
@@ -1371,10 +1370,8 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev, 
		     struct sk_buff *skb)

{

	struct b43legacy_dmaring *ring;

	struct ieee80211_hdr *hdr;

	int err = 0;

	unsigned long flags;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	ring = priority_to_txring(dev, skb_get_queue_mapping(skb));

	spin_lock_irqsave(&ring->lock, flags);
@@ -1401,8 +1398,6 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev, 


	/* dma_tx_fragment might reallocate the skb, so invalidate pointers pointing

	 * into the skb data or cb now. */

	hdr = NULL;

	info = NULL;

	err = dma_tx_fragment(ring, &skb);

	if (unlikely(err == -ENOKEY)) {

		/* Drop this packet, as we don't have the encryption key
@@ -1435,7 +1430,6 @@ void b43legacy_dma_handle_txstatus(struct b43legacy_wldev *dev, 
{

	const struct b43legacy_dma_ops *ops;

	struct b43legacy_dmaring *ring;

	struct b43legacy_dmadesc_generic *desc;

	struct b43legacy_dmadesc_meta *meta;

	int retry_limit;

	int slot;
@@ -1450,7 +1444,7 @@ void b43legacy_dma_handle_txstatus(struct b43legacy_wldev *dev, 
	ops = ring->ops;

	while (1) {

		B43legacy_WARN_ON(!(slot >= 0 && slot < ring->nr_slots));

		desc = ops->idx2desc(ring, slot, &meta);

		ops->idx2desc(ring, slot, &meta);



		if (meta->skb)

			unmap_descbuffer(ring, meta->dmaaddr,

drivers/net/wireless/b43legacy/main.c

+2 −6
Original line number Diff line number Diff line
@@ -1564,10 +1564,10 @@ static int b43legacy_request_firmware(struct b43legacy_wldev *dev) 
	struct b43legacy_firmware *fw = &dev->fw;

	const u8 rev = dev->dev->id.revision;

	const char *filename;

	u32 tmshigh;

	int err;



	tmshigh = ssb_read32(dev->dev, SSB_TMSHIGH);

	/* do dummy read */

	ssb_read32(dev->dev, SSB_TMSHIGH);

	if (!fw->ucode) {

		if (rev == 2)

			filename = "ucode2";
@@ -2634,11 +2634,9 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw, 
	unsigned long flags;

	unsigned int new_phymode = 0xFFFF;

	int antenna_tx;

	int antenna_rx;

	int err = 0;



	antenna_tx = B43legacy_ANTENNA_DEFAULT;

	antenna_rx = B43legacy_ANTENNA_DEFAULT;



	mutex_lock(&wl->mutex);

	dev = wl->current_dev;
@@ -2775,14 +2773,12 @@ static void b43legacy_op_bss_info_changed(struct ieee80211_hw *hw, 
{

	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);

	struct b43legacy_wldev *dev;

	struct b43legacy_phy *phy;

	unsigned long flags;



	mutex_lock(&wl->mutex);

	B43legacy_WARN_ON(wl->vif != vif);



	dev = wl->current_dev;

	phy = &dev->phy;



	/* Disable IRQs while reconfiguring the device.

	 * This makes it possible to drop the spinlock throughout

drivers/net/wireless/b43legacy/xmit.c

+0 −2
Original line number Diff line number Diff line
@@ -321,11 +321,9 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, 
		struct ieee80211_hdr *hdr;

		int rts_rate;

		int rts_rate_fb;

		int rts_rate_ofdm;

		int rts_rate_fb_ofdm;



		rts_rate = ieee80211_get_rts_cts_rate(dev->wl->hw, info)->hw_value;

		rts_rate_ofdm = b43legacy_is_ofdm_rate(rts_rate);

		rts_rate_fb = b43legacy_calc_fallback_rate(rts_rate);

		rts_rate_fb_ofdm = b43legacy_is_ofdm_rate(rts_rate_fb);

		if (rts_rate_fb_ofdm)