aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl3945-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl3945-base.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index a0b5a74972a9..5037216041ca 100644
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -2122,14 +2122,14 @@ static int il3945_set_ucode_ptrs(struct il_priv *il)
2122 pdata = il->ucode_data_backup.p_addr; 2122 pdata = il->ucode_data_backup.p_addr;
2123 2123
2124 /* Tell bootstrap uCode where to find image to load */ 2124 /* Tell bootstrap uCode where to find image to load */
2125 il_write_prph(il, BSM_DRAM_INST_PTR_REG, pinst); 2125 il_wr_prph(il, BSM_DRAM_INST_PTR_REG, pinst);
2126 il_write_prph(il, BSM_DRAM_DATA_PTR_REG, pdata); 2126 il_wr_prph(il, BSM_DRAM_DATA_PTR_REG, pdata);
2127 il_write_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG, 2127 il_wr_prph(il, BSM_DRAM_DATA_BYTECOUNT_REG,
2128 il->ucode_data.len); 2128 il->ucode_data.len);
2129 2129
2130 /* Inst byte count must be last to set up, bit 31 signals uCode 2130 /* Inst byte count must be last to set up, bit 31 signals uCode
2131 * that all new ptr/size info is in place */ 2131 * that all new ptr/size info is in place */
2132 il_write_prph(il, BSM_DRAM_INST_BYTECOUNT_REG, 2132 il_wr_prph(il, BSM_DRAM_INST_BYTECOUNT_REG,
2133 il->ucode_code.len | BSM_DRAM_INST_LOAD); 2133 il->ucode_code.len | BSM_DRAM_INST_LOAD);
2134 2134
2135 D_INFO("Runtime uCode pointers are set.\n"); 2135 D_INFO("Runtime uCode pointers are set.\n");
@@ -2210,7 +2210,7 @@ static void il3945_alive_start(struct il_priv *il)
2210 goto restart; 2210 goto restart;
2211 } 2211 }
2212 2212
2213 rfkill = il_read_prph(il, APMG_RFKILL_REG); 2213 rfkill = il_rd_prph(il, APMG_RFKILL_REG);
2214 D_INFO("RFKILL status: 0x%x\n", rfkill); 2214 D_INFO("RFKILL status: 0x%x\n", rfkill);
2215 2215
2216 if (rfkill & 0x1) { 2216 if (rfkill & 0x1) {
@@ -2342,7 +2342,7 @@ static void __il3945_down(struct il_priv *il)
2342 il3945_hw_rxq_stop(il); 2342 il3945_hw_rxq_stop(il);
2343 2343
2344 /* Power-down device's busmaster DMA clocks */ 2344 /* Power-down device's busmaster DMA clocks */
2345 il_write_prph(il, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT); 2345 il_wr_prph(il, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);
2346 udelay(5); 2346 udelay(5);
2347 2347
2348 /* Stop the device, and put it in low power state */ 2348 /* Stop the device, and put it in low power state */