|
@@ -275,10 +275,8 @@ static int iwl3945_tx_queue_alloc(struct iwl3945_priv *priv,
|
|
|
return 0;
|
|
|
|
|
|
error:
|
|
|
- if (txq->txb) {
|
|
|
- kfree(txq->txb);
|
|
|
- txq->txb = NULL;
|
|
|
- }
|
|
|
+ kfree(txq->txb);
|
|
|
+ txq->txb = NULL;
|
|
|
|
|
|
return -ENOMEM;
|
|
|
}
|
|
@@ -365,10 +363,8 @@ void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *t
|
|
|
txq->q.n_bd, txq->bd, txq->q.dma_addr);
|
|
|
|
|
|
/* De-alloc array of per-TFD driver data */
|
|
|
- if (txq->txb) {
|
|
|
- kfree(txq->txb);
|
|
|
- txq->txb = NULL;
|
|
|
- }
|
|
|
+ kfree(txq->txb);
|
|
|
+ txq->txb = NULL;
|
|
|
|
|
|
/* 0-fill queue descriptor structure */
|
|
|
memset(txq, 0, sizeof(*txq));
|
|
@@ -2703,9 +2699,8 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
|
|
|
|
|
|
if (!ieee80211_has_morefrags(hdr->frame_control)) {
|
|
|
txq->need_update = 1;
|
|
|
- if (qc) {
|
|
|
+ if (qc)
|
|
|
priv->stations[sta_id].tid[tid].seq_number = seq_number;
|
|
|
- }
|
|
|
} else {
|
|
|
wait_write_ptr = 1;
|
|
|
txq->need_update = 0;
|
|
@@ -3813,7 +3808,7 @@ int iwl3945_calc_db_from_ratio(int sig_ratio)
|
|
|
/* 100:1 or higher, divide by 10 and use table,
|
|
|
* add 20 dB to make up for divide by 10 */
|
|
|
if (sig_ratio >= 100)
|
|
|
- return (20 + (int)ratio2dB[sig_ratio/10]);
|
|
|
+ return 20 + (int)ratio2dB[sig_ratio/10];
|
|
|
|
|
|
/* We shouldn't see this */
|
|
|
if (sig_ratio < 1)
|
|
@@ -5088,7 +5083,7 @@ static void iwl3945_dealloc_ucode_pci(struct iwl3945_priv *priv)
|
|
|
* iwl3945_verify_inst_full - verify runtime uCode image in card vs. host,
|
|
|
* looking at all data.
|
|
|
*/
|
|
|
-static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 * image, u32 len)
|
|
|
+static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 *image, u32 len)
|
|
|
{
|
|
|
u32 val;
|
|
|
u32 save_len = len;
|
|
@@ -5237,7 +5232,7 @@ static int iwl3945_verify_bsm(struct iwl3945_priv *priv)
|
|
|
val = iwl3945_read_prph(priv, BSM_WR_DWCOUNT_REG);
|
|
|
for (reg = BSM_SRAM_LOWER_BOUND;
|
|
|
reg < BSM_SRAM_LOWER_BOUND + len;
|
|
|
- reg += sizeof(u32), image ++) {
|
|
|
+ reg += sizeof(u32), image++) {
|
|
|
val = iwl3945_read_prph(priv, reg);
|
|
|
if (val != le32_to_cpu(*image)) {
|
|
|
IWL_ERROR("BSM uCode verification failed at "
|
|
@@ -6336,7 +6331,7 @@ static void iwl3945_bg_post_associate(struct work_struct *data)
|
|
|
DECLARE_MAC_BUF(mac);
|
|
|
|
|
|
if (priv->iw_mode == IEEE80211_IF_TYPE_AP) {
|
|
|
- IWL_ERROR("%s Should not be called in AP mode\n", __FUNCTION__);
|
|
|
+ IWL_ERROR("%s Should not be called in AP mode\n", __func__);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -6417,7 +6412,7 @@ static void iwl3945_bg_post_associate(struct work_struct *data)
|
|
|
|
|
|
default:
|
|
|
IWL_ERROR("%s Should not be called in %d mode\n",
|
|
|
- __FUNCTION__, priv->iw_mode);
|
|
|
+ __func__, priv->iw_mode);
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -7456,7 +7451,7 @@ static ssize_t show_measurement(struct device *d,
|
|
|
struct iwl3945_priv *priv = dev_get_drvdata(d);
|
|
|
struct iwl3945_spectrum_notification measure_report;
|
|
|
u32 size = sizeof(measure_report), len = 0, ofs = 0;
|
|
|
- u8 *data = (u8 *) & measure_report;
|
|
|
+ u8 *data = (u8 *)&measure_report;
|
|
|
unsigned long flags;
|
|
|
|
|
|
spin_lock_irqsave(&priv->lock, flags);
|
|
@@ -7627,7 +7622,7 @@ static ssize_t show_power_level(struct device *d,
|
|
|
else
|
|
|
p += sprintf(p, " \n");
|
|
|
|
|
|
- return (p - buf + 1);
|
|
|
+ return p - buf + 1;
|
|
|
|
|
|
}
|
|
|
|
|
@@ -7649,7 +7644,7 @@ static ssize_t show_statistics(struct device *d,
|
|
|
struct iwl3945_priv *priv = dev_get_drvdata(d);
|
|
|
u32 size = sizeof(struct iwl3945_notif_statistics);
|
|
|
u32 len = 0, ofs = 0;
|
|
|
- u8 *data = (u8 *) & priv->statistics;
|
|
|
+ u8 *data = (u8 *)&priv->statistics;
|
|
|
int rc = 0;
|
|
|
|
|
|
if (!iwl3945_is_alive(priv))
|
|
@@ -8003,16 +7998,16 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
|
|
|
|
|
|
/* nic init */
|
|
|
iwl3945_set_bit(priv, CSR_GIO_CHICKEN_BITS,
|
|
|
- CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
|
|
|
-
|
|
|
- iwl3945_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
|
|
|
- err = iwl3945_poll_bit(priv, CSR_GP_CNTRL,
|
|
|
- CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
|
|
|
- CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
|
|
|
- if (err < 0) {
|
|
|
- IWL_DEBUG_INFO("Failed to init the card\n");
|
|
|
+ CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
|
|
|
+
|
|
|
+ iwl3945_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
|
|
|
+ err = iwl3945_poll_bit(priv, CSR_GP_CNTRL,
|
|
|
+ CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
|
|
|
+ CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
|
|
|
+ if (err < 0) {
|
|
|
+ IWL_DEBUG_INFO("Failed to init the card\n");
|
|
|
goto out_remove_sysfs;
|
|
|
- }
|
|
|
+ }
|
|
|
/* Read the EEPROM */
|
|
|
err = iwl3945_eeprom_init(priv);
|
|
|
if (err) {
|
|
@@ -8114,9 +8109,8 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
|
|
|
iwl3945_unset_hw_setting(priv);
|
|
|
iwl3945_clear_stations_table(priv);
|
|
|
|
|
|
- if (priv->mac80211_registered) {
|
|
|
+ if (priv->mac80211_registered)
|
|
|
ieee80211_unregister_hw(priv->hw);
|
|
|
- }
|
|
|
|
|
|
/*netif_stop_queue(dev); */
|
|
|
flush_workqueue(priv->workqueue);
|