iwlegacy: s/rx_handler/handler/

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>

1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 65cab84661ef..fa5e03841015 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -843,7 +843,7 @@ static void il3945_rx_card_state_notif(struct il_priv *il,
 }
 
 /**
- * il3945_setup_rx_handlers - Initialize Rx handler callbacks
+ * il3945_setup_handlers - Initialize Rx handler callbacks
  *
  * Setup the RX handlers for each of the reply types sent from the uCode
  * to the host.
@@ -851,32 +851,32 @@ static void il3945_rx_card_state_notif(struct il_priv *il,
  * This function chains into the hardware specific files for them to setup
  * any hardware specific handlers as well.
  */
-static void il3945_setup_rx_handlers(struct il_priv *il)
+static void il3945_setup_handlers(struct il_priv *il)
 {
-	il->rx_handlers[N_ALIVE] = il3945_rx_reply_alive;
-	il->rx_handlers[C_ADD_STA] = il3945_rx_reply_add_sta;
-	il->rx_handlers[N_ERROR] = il_rx_reply_error;
-	il->rx_handlers[N_CHANNEL_SWITCH] = il_rx_csa;
-	il->rx_handlers[N_SPECTRUM_MEASUREMENT] =
+	il->handlers[N_ALIVE] = il3945_rx_reply_alive;
+	il->handlers[C_ADD_STA] = il3945_rx_reply_add_sta;
+	il->handlers[N_ERROR] = il_rx_reply_error;
+	il->handlers[N_CHANNEL_SWITCH] = il_rx_csa;
+	il->handlers[N_SPECTRUM_MEASUREMENT] =
 			il_rx_spectrum_measure_notif;
-	il->rx_handlers[N_PM_SLEEP] = il_rx_pm_sleep_notif;
-	il->rx_handlers[N_PM_DEBUG_STATS] =
+	il->handlers[N_PM_SLEEP] = il_rx_pm_sleep_notif;
+	il->handlers[N_PM_DEBUG_STATS] =
 	    il_rx_pm_debug_stats_notif;
-	il->rx_handlers[N_BEACON] = il3945_rx_beacon_notif;
+	il->handlers[N_BEACON] = il3945_rx_beacon_notif;
 
 	/*
 	 * The same handler is used for both the REPLY to a discrete
 	 * stats request from the host as well as for the periodic
 	 * stats notifications (after received beacons) from the uCode.
 	 */
-	il->rx_handlers[C_STATS] = il3945_reply_stats;
-	il->rx_handlers[N_STATS] = il3945_hw_rx_stats;
+	il->handlers[C_STATS] = il3945_reply_stats;
+	il->handlers[N_STATS] = il3945_hw_rx_stats;
 
 	il_setup_rx_scan_handlers(il);
-	il->rx_handlers[N_CARD_STATE] = il3945_rx_card_state_notif;
+	il->handlers[N_CARD_STATE] = il3945_rx_card_state_notif;
 
 	/* Set up hardware specific Rx handlers */
-	il3945_hw_rx_handler_setup(il);
+	il3945_hw_handler_setup(il);
 }
 
 /************************** RX-FUNCTIONS ****************************/
@@ -1194,7 +1194,7 @@ int il3945_calc_db_from_ratio(int sig_ratio)
 /**
  * il3945_rx_handle - Main entry function for receiving responses from uCode
  *
- * Uses the il->rx_handlers callback function array to invoke
+ * Uses the il->handlers callback function array to invoke
  * the appropriate handlers, including command responses,
  * frame-received notifications, and other notifications.
  */
@@ -1258,12 +1258,12 @@ static void il3945_rx_handle(struct il_priv *il)
 
 		/* Based on type of command response or notification,
 		 *   handle those that need handling via function in
-		 *   rx_handlers table.  See il3945_setup_rx_handlers() */
-		if (il->rx_handlers[pkt->hdr.cmd]) {
+		 *   handlers table.  See il3945_setup_handlers() */
+		if (il->handlers[pkt->hdr.cmd]) {
 			D_RX("r = %d, i = %d, %s, 0x%02x\n", r, i,
 			il_get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
-			il->isr_stats.rx_handlers[pkt->hdr.cmd]++;
-			il->rx_handlers[pkt->hdr.cmd] (il, rxb);
+			il->isr_stats.handlers[pkt->hdr.cmd]++;
+			il->handlers[pkt->hdr.cmd] (il, rxb);
 		} else {
 			/* No handling needed */
 			D_RX(
@@ -1275,7 +1275,7 @@ static void il3945_rx_handle(struct il_priv *il)
 		/*
 		 * XXX: After here, we should always check rxb->page
 		 * against NULL before touching it or its virtual
-		 * memory (pkt). Because some rx_handler might have
+		 * memory (pkt). Because some handler might have
 		 * already taken or freed the pages.
 		 */
 
@@ -3807,7 +3807,7 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
 			     &il->bands[IEEE80211_BAND_2GHZ].channels[5],
 			     &il->ctx);
 	il3945_setup_deferred_work(il);
-	il3945_setup_rx_handlers(il);
+	il3945_setup_handlers(il);
 	il_power_initialize(il);
 
 	/*********************************