Commit ec9c4989 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

rt2x00: Use more current logging styles, shrink object size 



Reduce object space ~2% using more current logging styles.

Neaten and simplify logging macros.
Use wiphy_<level> where appropriate.
Coalesce formats.

Convert ERROR/WARNING/INFO macros to rt2x00_<level>
Convert EEPROM to rt2x00_eeprom_dbg
Convert PROBE_ERROR to rt2x00_probe_err
Convert DEBUG to rt2x00_dbg
Convert EEPROM to rt2x00_eeprom_dbg

$ size drivers/net/wireless/rt2x00/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 245639	  71696	  69584	 386919	  5e767	drivers/net/wireless/rt2x00/built-in.o.new
 240609	  70096	  68944	 379649	  5cb01	drivers/net/wireless/rt2x00/built-in.o.new.nodyndbg
 240609	  70096	  68944	 379649	  5cb01	drivers/net/wireless/rt2x00/built-in.o.new.no_rt2x00_debug
 249198	  70096	  70352	 389646	  5f20e	drivers/net/wireless/rt2x00/built-in.o.old
 249198	  70096	  70352	 389646	  5f20e	drivers/net/wireless/rt2x00/built-in.o.old.nodyndbg
 244222	  70096	  69712	 384030	  5dc1e	drivers/net/wireless/rt2x00/built-in.o.old.no_rt2x00_debug

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 624708b8

drivers/net/wireless/rt2x00/rt2400pci.c

+7 −7
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static int rt2400pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev) 
		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");

	return -EACCES;

}
@@ -1093,7 +1093,7 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",

			   state, retval);



	return retval;
@@ -1188,7 +1188,7 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, 
	rt2x00mmio_register_write(rt2x00dev, CSR14, reg);



	if (rt2x00queue_map_txskb(entry)) {

		ERROR(rt2x00dev, "Fail to map beacon, aborting\n");

		rt2x00_err(rt2x00dev, "Fail to map beacon, aborting\n");

		goto out;

	}

	/*
@@ -1464,12 +1464,12 @@ static int rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		EEPROM(rt2x00dev, "MAC: %pM\n", mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);

	if (word == 0xffff) {

		ERROR(rt2x00dev, "Invalid EEPROM data detected.\n");

		rt2x00_err(rt2x00dev, "Invalid EEPROM data detected\n");

		return -EINVAL;

	}
@@ -1496,7 +1496,7 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
			rt2x00_get_field32(reg, CSR0_REVISION));



	if (!rt2x00_rf(rt2x00dev, RF2420) && !rt2x00_rf(rt2x00dev, RF2421)) {

		ERROR(rt2x00dev, "Invalid RF chipset detected.\n");

		rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");

		return -ENODEV;

	}

drivers/net/wireless/rt2x00/rt2500pci.c

+10 −9
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ static int rt2500pci_wait_bbp_ready(struct rt2x00_dev *rt2x00dev) 
		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");

	return -EACCES;

}
@@ -1246,7 +1246,7 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",

			   state, retval);



	return retval;
@@ -1340,7 +1340,7 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, 
	rt2x00mmio_register_write(rt2x00dev, CSR14, reg);



	if (rt2x00queue_map_txskb(entry)) {

		ERROR(rt2x00dev, "Fail to map beacon, aborting\n");

		rt2x00_err(rt2x00dev, "Fail to map beacon, aborting\n");

		goto out;

	}
@@ -1590,7 +1590,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		EEPROM(rt2x00dev, "MAC: %pM\n", mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
@@ -1606,7 +1606,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);

		rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2522);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);

		EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word);
@@ -1615,7 +1615,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_NIC_DYN_BBP_TUNE, 0);

		rt2x00_set_field16(&word, EEPROM_NIC_CCK_TX_POWER, 0);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC, word);

		EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_CALIBRATE_OFFSET, &word);
@@ -1623,7 +1623,8 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_CALIBRATE_OFFSET_RSSI,

				   DEFAULT_RSSI_OFFSET);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_CALIBRATE_OFFSET, word);

		EEPROM(rt2x00dev, "Calibrate offset: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "Calibrate offset: 0x%04x\n",

				  word);

	}



	return 0;
@@ -1654,7 +1655,7 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	    !rt2x00_rf(rt2x00dev, RF2525) &&

	    !rt2x00_rf(rt2x00dev, RF2525E) &&

	    !rt2x00_rf(rt2x00dev, RF5222)) {

		ERROR(rt2x00dev, "Invalid RF chipset detected.\n");

		rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");

		return -ENODEV;

	}

drivers/net/wireless/rt2x00/rt2500usb.c

+18 −17
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ static int rt2500usb_regbusy_read(struct rt2x00_dev *rt2x00dev, 
		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "Indirect register access failed: "

	      "offset=0x%.08x, value=0x%.08x\n", offset, *reg);

	rt2x00_err(rt2x00dev, "Indirect register access failed: offset=0x%.08x, value=0x%.08x\n",

		   offset, *reg);

	*reg = ~0;



	return 0;
@@ -916,7 +916,7 @@ static int rt2500usb_wait_bbp_ready(struct rt2x00_dev *rt2x00dev) 
		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");

	return -EACCES;

}
@@ -1069,7 +1069,7 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",

			   state, retval);



	return retval;
@@ -1353,7 +1353,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		EEPROM(rt2x00dev, "MAC: %pM\n", mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
@@ -1369,7 +1369,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);

		rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2522);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word);

		EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word);
@@ -1378,7 +1378,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_NIC_DYN_BBP_TUNE, 0);

		rt2x00_set_field16(&word, EEPROM_NIC_CCK_TX_POWER, 0);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC, word);

		EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_CALIBRATE_OFFSET, &word);
@@ -1386,14 +1386,15 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_CALIBRATE_OFFSET_RSSI,

				   DEFAULT_RSSI_OFFSET);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_CALIBRATE_OFFSET, word);

		EEPROM(rt2x00dev, "Calibrate offset: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "Calibrate offset: 0x%04x\n",

				  word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE, &word);

	if (word == 0xffff) {

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_THRESHOLD, 45);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE, word);

		EEPROM(rt2x00dev, "BBPtune: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "BBPtune: 0x%04x\n", word);

	}



	/*
@@ -1408,7 +1409,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCUPPER, 0x40);

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);

		EEPROM(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);

	} else {

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
@@ -1419,7 +1420,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_LOW, 0x48);

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_HIGH, 0x41);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R17, word);

		EEPROM(rt2x00dev, "BBPtune r17: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r17: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R24, &word);
@@ -1427,7 +1428,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R24_LOW, 0x40);

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R24_HIGH, 0x80);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R24, word);

		EEPROM(rt2x00dev, "BBPtune r24: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r24: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R25, &word);
@@ -1435,7 +1436,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R25_LOW, 0x40);

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R25_HIGH, 0x50);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R25, word);

		EEPROM(rt2x00dev, "BBPtune r25: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r25: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R61, &word);
@@ -1443,7 +1444,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R61_LOW, 0x60);

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R61_HIGH, 0x6d);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R61, word);

		EEPROM(rt2x00dev, "BBPtune r61: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "BBPtune r61: 0x%04x\n", word);

	}



	return 0;
@@ -1468,7 +1469,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_chip(rt2x00dev, RT2570, value, reg);



	if (((reg & 0xfff0) != 0) || ((reg & 0x0000000f) == 0)) {

		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");

		rt2x00_err(rt2x00dev, "Invalid RT chipset detected\n");

		return -ENODEV;

	}
@@ -1478,7 +1479,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	    !rt2x00_rf(rt2x00dev, RF2525) &&

	    !rt2x00_rf(rt2x00dev, RF2525E) &&

	    !rt2x00_rf(rt2x00dev, RF5222)) {

		ERROR(rt2x00dev, "Invalid RF chipset detected.\n");

		rt2x00_err(rt2x00dev, "Invalid RF chipset detected\n");

		return -ENODEV;

	}

drivers/net/wireless/rt2x00/rt2800lib.c

+18 −17
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev) 
	    rt2x00_rf(rt2x00dev, RF3022))

		return true;



	WARNING(rt2x00dev, "Unknown RF chipset on rt305x\n");

	rt2x00_warn(rt2x00dev, "Unknown RF chipset on rt305x\n");

	return false;

}
@@ -328,7 +328,7 @@ int rt2800_wait_csr_ready(struct rt2x00_dev *rt2x00dev) 
		msleep(1);

	}



	ERROR(rt2x00dev, "Unstable hardware.\n");

	rt2x00_err(rt2x00dev, "Unstable hardware\n");

	return -EBUSY;

}

EXPORT_SYMBOL_GPL(rt2800_wait_csr_ready);
@@ -351,7 +351,7 @@ int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev) 
		msleep(10);

	}



	ERROR(rt2x00dev, "WPDMA TX/RX busy [0x%08x].\n", reg);

	rt2x00_err(rt2x00dev, "WPDMA TX/RX busy [0x%08x]\n", reg);

	return -EACCES;

}

EXPORT_SYMBOL_GPL(rt2800_wait_wpdma_ready);
@@ -512,7 +512,7 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev, 
	}



	if (i == REGISTER_BUSY_COUNT) {

		ERROR(rt2x00dev, "PBF system register not ready.\n");

		rt2x00_err(rt2x00dev, "PBF system register not ready\n");

		return -EBUSY;

	}
@@ -811,7 +811,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc) 
	 */

	padding_len = roundup(entry->skb->len, 4) - entry->skb->len;

	if (padding_len && skb_pad(entry->skb, padding_len)) {

		ERROR(rt2x00dev, "Failure padding beacon, aborting\n");

		rt2x00_err(rt2x00dev, "Failure padding beacon, aborting\n");

		/* skb freed by skb_pad() on failure */

		entry->skb = NULL;

		rt2800_register_write(rt2x00dev, BCN_TIME_CFG, orig_reg);
@@ -3869,7 +3869,7 @@ static int rt2800_wait_bbp_rf_ready(struct rt2x00_dev *rt2x00dev) 
		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP/RF register access failed, aborting.\n");

	rt2x00_err(rt2x00dev, "BBP/RF register access failed, aborting\n");

	return -EACCES;

}
@@ -3893,7 +3893,7 @@ static int rt2800_wait_bbp_ready(struct rt2x00_dev *rt2x00dev) 
		udelay(REGISTER_BUSY_DELAY);

	}



	ERROR(rt2x00dev, "BBP register access failed, aborting.\n");

	rt2x00_err(rt2x00dev, "BBP register access failed, aborting\n");

	return -EACCES;

}
@@ -5353,7 +5353,7 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		EEPROM(rt2x00dev, "MAC: %pM\n", mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &word);
@@ -5362,7 +5362,7 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_NIC_CONF0_TXPATH, 1);

		rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);

		EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);

	} else if (rt2x00_rt(rt2x00dev, RT2860) ||

		   rt2x00_rt(rt2x00dev, RT2872)) {

		/*
@@ -5391,14 +5391,14 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_NIC_CONF1_BT_COEXIST, 0);

		rt2x00_set_field16(&word, EEPROM_NIC_CONF1_DAC_TEST, 0);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF1, word);

		EEPROM(rt2x00dev, "NIC: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "NIC: 0x%04x\n", word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_FREQ, &word);

	if ((word & 0x00ff) == 0x00ff) {

		rt2x00_set_field16(&word, EEPROM_FREQ_OFFSET, 0);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_FREQ, word);

		EEPROM(rt2x00dev, "Freq: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "Freq: 0x%04x\n", word);

	}

	if ((word & 0xff00) == 0xff00) {

		rt2x00_set_field16(&word, EEPROM_FREQ_LED_MODE,
@@ -5408,7 +5408,7 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_AG_CONF, 0x5555);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_ACT_CONF, 0x2221);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_LED_POLARITY, 0xa9f8);

		EEPROM(rt2x00dev, "Led Mode: 0x%04x\n", word);

		rt2x00_eeprom_dbg(rt2x00dev, "Led Mode: 0x%04x\n", word);

	}



	/*
@@ -5514,7 +5514,8 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	case RF5592:

		break;

	default:

		ERROR(rt2x00dev, "Invalid RF chipset 0x%04x detected.\n", rf);

		rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",

			   rf);

		return -ENODEV;

	}
@@ -6103,8 +6104,7 @@ static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev) 
	case RT5592:

		break;

	default:

		ERROR(rt2x00dev,

		      "Invalid RT chipset 0x%04x, rev %04x detected.\n",

		rt2x00_err(rt2x00dev, "Invalid RT chipset 0x%04x, rev %04x detected\n",

			   rt, rev);

		return -ENODEV;

	}
@@ -6364,7 +6364,8 @@ int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	case IEEE80211_AMPDU_TX_OPERATIONAL:

		break;

	default:

		WARNING((struct rt2x00_dev *)hw->priv, "Unknown AMPDU action\n");

		rt2x00_warn((struct rt2x00_dev *)hw->priv,

			    "Unknown AMPDU action\n");

	}



	return ret;

drivers/net/wireless/rt2x00/rt2800pci.c

+12 −14
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token) 
	}



	if (i == 200)

		ERROR(rt2x00dev, "MCU request failed, no response from hardware\n");

		rt2x00_err(rt2x00dev, "MCU request failed, no response from hardware\n");



	rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);

	rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
@@ -616,7 +616,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
	}



	if (unlikely(retval))

		ERROR(rt2x00dev, "Device failed to enter state %d (%d).\n",

		rt2x00_err(rt2x00dev, "Device failed to enter state %d (%d)\n",

			   state, retval);



	return retval;
@@ -843,8 +843,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) 
			 * Unknown queue, this shouldn't happen. Just drop

			 * this tx status.

			 */

			WARNING(rt2x00dev, "Got TX status report with "

					   "unexpected pid %u, dropping\n", qid);

			rt2x00_warn(rt2x00dev, "Got TX status report with unexpected pid %u, dropping\n",

				    qid);

			break;

		}
@@ -854,8 +854,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) 
			 * The queue is NULL, this shouldn't happen. Stop

			 * processing here and drop the tx status

			 */

			WARNING(rt2x00dev, "Got TX status for an unavailable "

					   "queue %u, dropping\n", qid);

			rt2x00_warn(rt2x00dev, "Got TX status for an unavailable queue %u, dropping\n",

				    qid);

			break;

		}
@@ -864,8 +864,8 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) 
			 * The queue is empty. Stop processing here

			 * and drop the tx status.

			 */

			WARNING(rt2x00dev, "Got TX status for an empty "

					   "queue %u, dropping\n", qid);

			rt2x00_warn(rt2x00dev, "Got TX status for an empty queue %u, dropping\n",

				    qid);

			break;

		}
@@ -883,8 +883,7 @@ static bool rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) 
			if (!rt2x00queue_for_each_entry(queue, Q_INDEX_DONE,

							Q_INDEX, &status,

							rt2800pci_txdone_match_first)) {

				WARNING(rt2x00dev, "No frame found for TX "

						   "status on queue %u, dropping\n",

				rt2x00_warn(rt2x00dev, "No frame found for TX status on queue %u, dropping\n",

					    qid);

				break;

			}
@@ -1022,8 +1021,7 @@ static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev) 
			break;



		if (!kfifo_put(&rt2x00dev->txstatus_fifo, &status)) {

			WARNING(rt2x00dev, "TX status FIFO overrun,"

				"drop tx status report.\n");

			rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status report\n");

			break;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE