iwlegacy: checkpatch.pl fixes (1722f8e1) · Commits · jan.koester / Linux

drivers/net/wireless/iwlegacy/3945-mac.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1033,11 +1033,9 @@ il3945_rx_allocate(struct il_priv *il, gfp_t priority)
		D_INFO("Failed to allocate SKB buffer.\n");
		if (rxq->free_count <= RX_LOW_WATERMARK &&
		net_ratelimit())
		IL_ERR
		("Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
		priority ==
		GFP_ATOMIC ? "GFP_ATOMIC" : "GFP_KERNEL",
		rxq->free_count);
		IL_ERR("Failed to allocate SKB buffer with %0x."
		"Only %u free buffers remaining.\n",
		priority, rxq->free_count);
		/* We don't reschedule replenish work here -- we will
		* call the restock method and if it still needs
		* more buffers it will schedule replenish */

drivers/net/wireless/iwlegacy/3945.c

+22 −21

Original line number	Diff line number	Diff line
		@@ -775,7 +775,8 @@ il3945_set_pwr_vmain(struct il_priv *il)
		APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
		~APMG_PS_CTRL_MSK_PWR_SRC);

		_il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC, CSR_GPIO_IN_BIT_AUX_POWER, 5000); /* uS */
		_il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC,
		CSR_GPIO_IN_BIT_AUX_POWER, 5000);
		}

		static int
		@@ -1228,7 +1229,8 @@ static struct il3945_tx_power power_gain_table[2][IL_MAX_GAIN_ENTRIES] = {
		{3, 113},
		{3, 106},
		{3, 102},
		{3, 95}}, /* 2.4 GHz, lowest power */
		{3, 95} /* 2.4 GHz, lowest power */
		},
		{
		{251, 127}, /* 5.x GHz, highest power */
		{251, 120},
		@@ -1307,7 +1309,8 @@ static struct il3945_tx_power power_gain_table[2][IL_MAX_GAIN_ENTRIES] = {
		{35, 113},
		{35, 107},
		{35, 99},
		{3, 120}} /* 5.x GHz, lowest power */
		{3, 120} /* 5.x GHz, lowest power */
		}
		};

		static inline u8
		@@ -1883,8 +1886,7 @@ il3945_bg_reg_txpower_periodic(struct work_struct *work)
		}

		/**
		* il3945_hw_reg_get_ch_grp_idx - find the channel-group idx (0-4)
		* for the channel.
		* il3945_hw_reg_get_ch_grp_idx - find the channel-group idx (0-4) for channel.
		*
		* This function is used when initializing channel-info structs.
		*
		@@ -2735,14 +2737,13 @@ static struct il_cfg il3945_abg_cfg = {
		};

		DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = {
		{
		IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)}, {
		IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)}, {
		IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)}, {
		IL_PCI_DEVICE(0x4227, 0x1014, il3945_bg_cfg)}, {
		IL_PCI_DEVICE(0x4222, PCI_ANY_ID, il3945_abg_cfg)}, {
		IL_PCI_DEVICE(0x4227, PCI_ANY_ID, il3945_abg_cfg)}, {
		0}
		{IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)},
		{IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)},
		{IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)},
		{IL_PCI_DEVICE(0x4227, 0x1014, il3945_bg_cfg)},
		{IL_PCI_DEVICE(0x4222, PCI_ANY_ID, il3945_abg_cfg)},
		{IL_PCI_DEVICE(0x4227, PCI_ANY_ID, il3945_abg_cfg)},
		{0}
		};

		MODULE_DEVICE_TABLE(pci, il3945_hw_card_ids);

drivers/net/wireless/iwlegacy/3945.h

+12 −17

Original line number	Diff line number	Diff line
		@@ -269,11 +269,6 @@ extern int il3945_init_hw_rate_table(struct il_priv *il);
		extern void il3945_reg_txpower_periodic(struct il_priv *il);
		extern int il3945_txpower_set_from_eeprom(struct il_priv *il);

		extern const struct il_channel_info *il3945_get_channel_info(const struct
		il_priv *il,
		enum ieee80211_band
		band, u16 channel);

		extern int il3945_rs_next_rate(struct il_priv *il, int rate);

		/* scanning */

drivers/net/wireless/iwlegacy/4965-calib.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -707,9 +707,8 @@ il4965_find_disconn_antenna(struct il_priv il, u32 average_sig,
		il4965_find_first_chain(il->cfg->valid_tx_ant);
		data->disconn_array[first_chain] = 0;
		active_chains \|= BIT(first_chain);
		D_CALIB
		("All Tx chains are disconnected W/A - declare %d as connected\n",
		first_chain);
		D_CALIB("All Tx chains are disconnected"
		"- declare %d as connected\n", first_chain);
		break;
		}
		}

drivers/net/wireless/iwlegacy/4965-mac.c

+27 −33

Original line number	Diff line number	Diff line
		@@ -163,10 +163,10 @@ il4965_rx_init(struct il_priv il, struct il_rx_queue rxq)
		il_wr(il, FH49_MEM_RCSR_CHNL0_CONFIG_REG,
		FH49_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL \|
		FH49_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL \|
		FH49_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK \| rb_size \| (rb_timeout
		<<
		FH49_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS)
		\| (rfdnlog << FH49_RCSR_RX_CONFIG_RBDCB_SIZE_POS));
		FH49_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK \|
		rb_size \|
		(rb_timeout << FH49_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS) \|
		(rfdnlog << FH49_RCSR_RX_CONFIG_RBDCB_SIZE_POS));

		/* Set interrupt coalescing timer to default (2048 usecs) */
		il_write8(il, CSR_INT_COALESCING, IL_HOST_INT_TIMEOUT_DEF);
		@@ -1235,9 +1235,8 @@ il4965_dump_fh(struct il_priv il, char *buf, bool display)
		pos +=
		scnprintf(*buf + pos, bufsz - pos,
		" %34s: 0X%08x\n",
		il4965_get_fh_string(fh_tbl[i]), il_rd(il,
		fh_tbl
		[i]));
		il4965_get_fh_string(fh_tbl[i]),
		il_rd(il, fh_tbl[i]));
		}
		return pos;
		}
		@@ -2093,8 +2092,8 @@ il4965_txq_ctx_stop(struct il_priv *il)
		(il, FH49_TSSR_TX_STATUS_REG,
		FH49_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch), 1000))
		IL_ERR("Failing on timeout while stopping"
		" DMA channel %d [0x%08x]", ch, il_rd(il,
		FH49_TSSR_TX_STATUS_REG));
		" DMA channel %d [0x%08x]", ch,
		il_rd(il, FH49_TSSR_TX_STATUS_REG));
		}
		spin_unlock_irqrestore(&il->lock, flags);

		@@ -2135,8 +2134,8 @@ il4965_tx_queue_stop_scheduler(struct il_priv *il, u16 txq_id)
		/* Simply stop the queue, but don't change any configuration;
		* the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */
		il_wr_prph(il, IL49_SCD_QUEUE_STATUS_BITS(txq_id),
		(0 << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) \| (1 <<
		IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
		(0 << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) \|
		(1 << IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
		}

		/**
		@@ -3277,8 +3276,7 @@ il4965_update_bcast_station(struct il_priv il, struct il_rxon_context ctx)

		link_cmd = il4965_sta_alloc_lq(il, sta_id);
		if (!link_cmd) {
		IL_ERR
		("Unable to initialize rate scaling for bcast station.\n");
		IL_ERR("Unable to initialize rate scaling for bcast sta.\n");
		return -ENOMEM;
		}

		@@ -3286,8 +3284,7 @@ il4965_update_bcast_station(struct il_priv il, struct il_rxon_context ctx)
		if (il->stations[sta_id].lq)
		kfree(il->stations[sta_id].lq);
		else
		D_INFO
		("Bcast station rate scaling has not been initialized yet.\n");
		D_INFO("Bcast sta rate scaling has not been initialized.\n");
		il->stations[sta_id].lq = link_cmd;
		spin_unlock_irqrestore(&il->sta_lock, flags);

		@@ -4819,11 +4816,10 @@ il4965_dump_nic_error_log(struct il_priv *il)
		u32 blink1, blink2, ilink1, ilink2;
		u32 pc, hcmd;

		if (il->ucode_type == UCODE_INIT) {
		if (il->ucode_type == UCODE_INIT)
		base = le32_to_cpu(il->card_alive_init.error_event_table_ptr);
		} else {
		else
		base = le32_to_cpu(il->card_alive.error_event_table_ptr);
		}

		if (!il->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
		IL_ERR("Not valid error log pointer 0x%08X for %s uCode\n",
		@@ -6026,13 +6022,11 @@ il4965_tx_queue_set_status(struct il_priv il, struct il_tx_queue txq,

		/* Set up and activate */
		il_wr_prph(il, IL49_SCD_QUEUE_STATUS_BITS(txq_id),
		(active << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) \| (tx_fifo_id
		<<
		IL49_SCD_QUEUE_STTS_REG_POS_TXF)
		\| (scd_retry << IL49_SCD_QUEUE_STTS_REG_POS_WSL) \| (scd_retry
		<<
		IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK)
		\| IL49_SCD_QUEUE_STTS_REG_MSK);
		(active << IL49_SCD_QUEUE_STTS_REG_POS_ACTIVE) \|
		(tx_fifo_id << IL49_SCD_QUEUE_STTS_REG_POS_TXF) \|
		(scd_retry << IL49_SCD_QUEUE_STTS_REG_POS_WSL) \|
		(scd_retry << IL49_SCD_QUEUE_STTS_REG_POS_SCD_ACK) \|
		IL49_SCD_QUEUE_STTS_REG_MSK);

		txq->sched_retry = scd_retry;