wireless: ti: Convert specialized logging macros to kernel style

index bea06b2..4a11158 100644
@@ -42,7 +42,7 @@ int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap)
 	ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,
 				   bitmap_conf, sizeof(*bitmap_conf));
 	if (ret < 0) {
-		wl1271_warning("wl1271 bitmap config opt failed: %d", ret);
+		dev_warn(wl->dev, "wl1271 bitmap config opt failed: %d\n", ret);
 		goto out;
 	}
 

index 7485dba..8f358d3 100644
@@ -54,7 +54,7 @@ int wl1271_cmd_ext_radio_parms(struct wl1271 *wl)
 
 	ret = wl1271_cmd_test(wl, ext_radio_parms, sizeof(*ext_radio_parms), 0);
 	if (ret < 0)
-		wl1271_warning("TEST_CMD_INI_FILE_RF_EXTENDED_PARAM failed");
+		dev_warn(wl->dev, "TEST_CMD_INI_FILE_RF_EXTENDED_PARAM failed\n");
 
 	kfree(ext_radio_parms);
 	return ret;

@@ -73,7 +73,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
 		return -ENODEV;
 
 	if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-		wl1271_warning("FEM index from INI out of bounds");
+		dev_warn(wl->dev, "FEM index from INI out of bounds\n");
 		return -EINVAL;
 	}
 

@@ -97,7 +97,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
 
 	ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
 	if (ret < 0) {
-		wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
+		dev_warn(wl->dev, "CMD_INI_FILE_GENERAL_PARAM failed\n");
 		goto out;
 	}
 

@@ -105,7 +105,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
 		gen_parms->general_params.tx_bip_fem_manufacturer;
 
 	if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-		wl1271_warning("FEM index from FW out of bounds");
+		dev_warn(wl->dev, "FEM index from FW out of bounds\n");
 		ret = -EINVAL;
 		goto out;
 	}

@@ -140,7 +140,7 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
 		return -ENODEV;
 
 	if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-		wl1271_warning("FEM index from ini out of bounds");
+		dev_warn(wl->dev, "FEM index from ini out of bounds\n");
 		return -EINVAL;
 	}
 

@@ -165,7 +165,7 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
 
 	ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
 	if (ret < 0) {
-		wl1271_warning("CMD_INI_FILE_GENERAL_PARAM failed");
+		dev_warn(wl->dev, "CMD_INI_FILE_GENERAL_PARAM failed\n");
 		goto out;
 	}
 

@@ -173,7 +173,7 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
 		gen_parms->general_params.tx_bip_fem_manufacturer;
 
 	if (gp->tx_bip_fem_manufacturer >= WL1271_INI_FEM_MODULE_COUNT) {
-		wl1271_warning("FEM index from FW out of bounds");
+		dev_warn(wl->dev, "FEM index from FW out of bounds\n");
 		ret = -EINVAL;
 		goto out;
 	}

@@ -233,7 +233,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
 
 	ret = wl1271_cmd_test(wl, radio_parms, sizeof(*radio_parms), 0);
 	if (ret < 0)
-		wl1271_warning("CMD_INI_FILE_RADIO_PARAM failed");
+		dev_warn(wl->dev, "CMD_INI_FILE_RADIO_PARAM failed\n");
 
 	kfree(radio_parms);
 	return ret;

@@ -279,7 +279,7 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
 
 	ret = wl1271_cmd_test(wl, radio_parms, sizeof(*radio_parms), 0);
 	if (ret < 0)
-		wl1271_warning("CMD_INI_FILE_RADIO_PARAM failed");
+		dev_warn(wl->dev, "CMD_INI_FILE_RADIO_PARAM failed\n");
 
 	kfree(radio_parms);
 	return ret;

@@ -311,7 +311,7 @@ int wl12xx_cmd_channel_switch(struct wl1271 *wl,
 
 	ret = wl1271_cmd_send(wl, CMD_CHANNEL_SWITCH, cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send channel switch command");
+		dev_err(wl->dev, "failed to send channel switch command\n");
 		goto out_free;
 	}
 

index a0d6ccc..c9d793d 100644
@@ -19,6 +19,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/platform_device.h>
 

@@ -642,8 +644,8 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
 
 	switch (wl->chip.id) {
 	case CHIP_ID_127X_PG10:
-		wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",
-			       wl->chip.id);
+		dev_warn(wl->dev, "chip id 0x%x (1271 PG10) support is obsolete\n",
+			 wl->chip.id);
 
 		wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |
 			      WLCORE_QUIRK_DUAL_PROBE_TMPL |

@@ -712,7 +714,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
 		break;
 	case CHIP_ID_128X_PG10:
 	default:
-		wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
+		dev_warn(wl->dev, "unsupported chip id: 0x%x\n", wl->chip.id);
 		ret = -ENODEV;
 		goto out;
 	}

@@ -782,13 +784,13 @@ static int __must_check wl12xx_top_reg_read(struct wl1271 *wl, int addr,
 	} while (!(val & OCP_READY_MASK) && --timeout);
 
 	if (!timeout) {
-		wl1271_warning("Top register access timed out.");
+		dev_warn(wl->dev, "Top register access timed out\n");
 		return -ETIMEDOUT;
 	}
 
 	/* check data status and return if OK */
 	if ((val & OCP_STATUS_MASK) != OCP_STATUS_OK) {
-		wl1271_warning("Top register access returned error.");
+		dev_warn(wl->dev, "Top register access returned error\n");
 		return -EIO;
 	}
 

@@ -1073,7 +1075,7 @@ static int wl1271_boot_soft_reset(struct wl1271 *wl)
 		if (time_after(jiffies, timeout)) {
 			/* 1.2 check pWhalBus->uSelfClearTime if the
 			 * timeout was reached */
-			wl1271_error("soft reset timeout");
+			dev_err(wl->dev, "soft reset timeout\n");
 			return -1;
 		}
 

@@ -1836,10 +1838,10 @@ static int wl12xx_setup(struct wl1271 *wl)
 						pdev_data->ref_clock_freq,
 						pdev_data->ref_clock_xtal);
 		if (priv->ref_clock < 0) {
-			wl1271_error("Invalid ref_clock frequency (%d Hz, %s)",
-				     pdev_data->ref_clock_freq,
-				     pdev_data->ref_clock_xtal ?
-				     "XTAL" : "not XTAL");
+			dev_err(wl->dev, "Invalid ref_clock frequency (%d Hz, %s)\n",
+				pdev_data->ref_clock_freq,
+				pdev_data->ref_clock_xtal ?
+				"XTAL" : "not XTAL");
 
 			return priv->ref_clock;
 		}

@@ -1857,7 +1859,8 @@ static int wl12xx_setup(struct wl1271 *wl)
 		else if (!strcmp(fref_param, "52"))
 			priv->ref_clock = WL12XX_REFCLOCK_52;
 		else
-			wl1271_error("Invalid fref parameter %s", fref_param);
+			dev_err(wl->dev, "Invalid fref parameter %s\n",
+				fref_param);
 	}
 
 	if (!tcxo_param && pdev_data->tcxo_clock_freq) {

@@ -1865,8 +1868,8 @@ static int wl12xx_setup(struct wl1271 *wl)
 						pdev_data->tcxo_clock_freq,
 						true);
 		if (priv->tcxo_clock < 0) {
-			wl1271_error("Invalid tcxo_clock frequency (%d Hz)",
-				     pdev_data->tcxo_clock_freq);
+			dev_err(wl->dev, "Invalid tcxo_clock frequency (%d Hz)\n",
+				pdev_data->tcxo_clock_freq);
 
 			return priv->tcxo_clock;
 		}

@@ -1888,7 +1891,8 @@ static int wl12xx_setup(struct wl1271 *wl)
 		else if (!strcmp(tcxo_param, "33.6"))
 			priv->tcxo_clock = WL12XX_TCXOCLOCK_33_6;
 		else
-			wl1271_error("Invalid tcxo parameter %s", tcxo_param);
+			dev_err(wl->dev, "Invalid tcxo parameter %s\n",
+				tcxo_param);
 	}
 
 	priv->rx_mem_addr = kmalloc(sizeof(*priv->rx_mem_addr), GFP_KERNEL);

@@ -1908,7 +1912,7 @@ static int wl12xx_probe(struct platform_device *pdev)
 			     WL12XX_AGGR_BUFFER_SIZE,
 			     sizeof(struct wl12xx_event_mailbox));
 	if (IS_ERR(hw)) {
-		wl1271_error("can't allocate hw");
+		pr_err("can't allocate hw\n");
 		ret = PTR_ERR(hw);
 		goto out;
 	}

index ebed13a..c474179 100644
@@ -162,7 +162,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 					 wl->scan.req->ie,
 					 wl->scan.req->ie_len, NULL, 0, false);
 	if (ret < 0) {
-		wl1271_error("PROBE request template failed");
+		dev_err(wl->dev, "PROBE request template failed\n");
 		goto out;
 	}
 

@@ -170,7 +170,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 	ret = wl1271_cmd_send(wl, CMD_TRIGGER_SCAN_TO, trigger,
 			      sizeof(*trigger), 0);
 	if (ret < 0) {
-		wl1271_error("trigger scan to failed for hw scan");
+		dev_err(wl->dev, "trigger scan to failed for hw scan\n");
 		goto out;
 	}
 

@@ -178,7 +178,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
 	ret = wl1271_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("SCAN failed");
+		dev_err(wl->dev, "SCAN failed\n");
 		goto out;
 	}
 

@@ -207,7 +207,7 @@ int wl12xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 	ret = wl1271_cmd_send(wl, CMD_STOP_SCAN, cmd,
 			      sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("cmd stop_scan failed");
+		dev_err(wl->dev, "cmd stop_scan failed\n");
 		goto out;
 	}
 out:

@@ -292,7 +292,7 @@ void wl1271_scan_stm(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 		break;
 
 	default:
-		wl1271_error("invalid scan state");
+		dev_err(wl->dev, "invalid scan state\n");
 		break;
 	}
 

@@ -371,7 +371,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
 	if (!wlcore_set_scan_chan_params(wl, cfg_channels, req->channels,
 					 req->n_channels, req->n_ssids,
 					 SCAN_TYPE_PERIODIC)) {
-		wl1271_error("scan channel list is empty");
+		dev_err(wl->dev, "scan channel list is empty\n");
 		ret = -EINVAL;
 		goto out;
 	}

@@ -389,7 +389,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
 						 ies->common_ie_len,
 						 true);
 		if (ret < 0) {
-			wl1271_error("2.4GHz PROBE request template failed");
+			dev_err(wl->dev, "2.4GHz PROBE request template failed\n");
 			goto out;
 		}
 	}

@@ -406,7 +406,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
 						 ies->common_ie_len,
 						 true);
 		if (ret < 0) {
-			wl1271_error("5GHz PROBE request template failed");
+			dev_err(wl->dev, "5GHz PROBE request template failed\n");
 			goto out;
 		}
 	}

@@ -416,7 +416,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
 	ret = wl1271_cmd_send(wl, CMD_CONNECTION_SCAN_CFG, cfg,
 			      sizeof(*cfg), 0);
 	if (ret < 0) {
-		wl1271_error("SCAN configuration failed");
+		dev_err(wl->dev, "SCAN configuration failed\n");
 		goto out;
 	}
 out:

@@ -449,7 +449,7 @@ int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 	ret = wl1271_cmd_send(wl, CMD_START_PERIODIC_SCAN, start,
 			      sizeof(*start), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send scan start command");
+		dev_err(wl->dev, "failed to send scan start command\n");
 		goto out_free;
 	}
 

@@ -481,7 +481,7 @@ void wl12xx_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif)
 	/* FIXME: what to do if alloc'ing to stop fails? */
 	stop = kzalloc(sizeof(*stop), GFP_KERNEL);
 	if (!stop) {
-		wl1271_error("failed to alloc memory to send sched scan stop");
+		dev_err(wl->dev, "failed to alloc memory to send sched scan stop\n");
 		return;
 	}
 

@@ -491,7 +491,7 @@ void wl12xx_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif)
 	ret = wl1271_cmd_send(wl, CMD_STOP_PERIODIC_SCAN, stop,
 			      sizeof(*stop), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send sched scan stop command");
+		dev_err(wl->dev, "failed to send sched scan stop command\n");
 		goto out_free;
 	}
 

index 4be0409..b314151 100644
@@ -51,7 +51,7 @@ int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,
 	ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,
 				   bitmap_conf, sizeof(*bitmap_conf));
 	if (ret < 0) {
-		wl1271_warning("wl1271 bitmap config opt failed: %d", ret);
+		dev_warn(wl->dev, "wl1271 bitmap config opt failed: %d\n", ret);
 		goto out;
 	}
 

@@ -78,7 +78,7 @@ int wl18xx_acx_set_checksum_state(struct wl1271 *wl)
 
 	ret = wl1271_cmd_configure(wl, ACX_CSUM_CONFIG, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1271_warning("failed to set Tx checksum state: %d", ret);
+		dev_warn(wl->dev, "failed to set Tx checksum state: %d\n", ret);
 		goto out;
 	}
 

@@ -102,7 +102,8 @@ int wl18xx_acx_clear_statistics(struct wl1271 *wl)
 
 	ret = wl1271_cmd_configure(wl, ACX_CLEAR_STATISTICS, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1271_warning("failed to clear firmware statistics: %d", ret);
+		dev_warn(wl->dev, "failed to clear firmware statistics: %d\n",
+			 ret);
 		goto out;
 	}
 

@@ -132,7 +133,8 @@ int wl18xx_acx_peer_ht_operation_mode(struct wl1271 *wl, u8 hlid, bool wide)
 				   sizeof(*acx));
 
 	if (ret < 0) {
-		wl1271_warning("acx peer ht operation mode failed: %d", ret);
+		dev_warn(wl->dev, "acx peer ht operation mode failed: %d\n",
+			 ret);
 		goto out;
 	}
 

@@ -187,7 +189,8 @@ int wl18xx_acx_set_peer_cap(struct wl1271 *wl,
 
 	ret = wl1271_cmd_configure(wl, ACX_PEER_CAP, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1271_warning("acx ht capabilities setting failed: %d", ret);
+		dev_warn(wl->dev, "acx ht capabilities setting failed: %d\n",
+			 ret);
 		goto out;
 	}
 

@@ -215,7 +218,8 @@ int wl18xx_acx_interrupt_notify_config(struct wl1271 *wl,
 	acx->enable = action;
 	ret = wl1271_cmd_configure(wl, ACX_INTERRUPT_NOTIFY, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1271_warning("acx interrupt notify setting failed: %d", ret);
+		dev_warn(wl->dev, "acx interrupt notify setting failed: %d\n",
+			 ret);
 		goto out;
 	}
 

@@ -242,8 +246,8 @@ int wl18xx_acx_rx_ba_filter(struct wl1271 *wl, bool action)
 	acx->enable = (u32)action;
 	ret = wl1271_cmd_configure(wl, ACX_RX_BA_FILTER, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1271_warning("acx rx ba activity filter setting failed: %d",
-			       ret);
+		dev_warn(wl->dev, "acx rx ba activity filter setting failed: %d\n",
+			 ret);
 		goto out;
 	}
 

@@ -274,7 +278,7 @@ int wl18xx_acx_ap_sleep(struct wl1271 *wl)
 
 	ret = wl1271_cmd_configure(wl, ACX_AP_SLEEP_CFG, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1271_warning("acx config ap-sleep failed: %d", ret);
+		dev_warn(wl->dev, "acx config ap-sleep failed: %d\n", ret);
 		goto out;
 	}
 

@@ -302,7 +306,8 @@ int wl18xx_acx_dynamic_fw_traces(struct wl1271 *wl)
 	ret = wl1271_cmd_configure(wl, ACX_DYNAMIC_TRACES_CFG,
 				   acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1271_warning("acx config dynamic fw traces failed: %d", ret);
+		dev_warn(wl->dev, "acx config dynamic fw traces failed: %d\n",
+			 ret);
 		goto out;
 	}
 out:

index a8d176d..31bca7f 100644
@@ -55,8 +55,8 @@ int wl18xx_cmd_channel_switch(struct wl1271 *wl,
 		cmd->band = WLCORE_BAND_5GHZ;
 		break;
 	default:
-		wl1271_error("invalid channel switch band: %d",
-			     ch_switch->chandef.chan->band);
+		dev_err(wl->dev, "invalid channel switch band: %d\n",
+			ch_switch->chandef.chan->band);
 		ret = -EINVAL;
 		goto out_free;
 	}

@@ -74,7 +74,7 @@ int wl18xx_cmd_channel_switch(struct wl1271 *wl,
 
 	ret = wl1271_cmd_send(wl, CMD_CHANNEL_SWITCH, cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send channel switch command");
+		dev_err(wl->dev, "failed to send channel switch command\n");
 		goto out_free;
 	}
 

@@ -102,7 +102,7 @@ int wl18xx_cmd_smart_config_start(struct wl1271 *wl, u32 group_bitmap)
 
 	ret = wl1271_cmd_send(wl, CMD_SMART_CONFIG_START, cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send smart config start command");
+		dev_err(wl->dev, "failed to send smart config start command\n");
 		goto out_free;
 	}
 

@@ -127,7 +127,7 @@ int wl18xx_cmd_smart_config_stop(struct wl1271 *wl)
 
 	ret = wl1271_cmd_send(wl, CMD_SMART_CONFIG_STOP, cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send smart config stop command");
+		dev_err(wl->dev, "failed to send smart config stop command\n");
 		goto out_free;
 	}
 

@@ -147,7 +147,7 @@ int wl18xx_cmd_smart_config_set_group_key(struct wl1271 *wl, u16 group_id,
 		     group_id);
 
 	if (key_len != sizeof(cmd->key)) {
-		wl1271_error("invalid group key size: %d", key_len);
+		dev_err(wl->dev, "invalid group key size: %d\n", key_len);
 		return -E2BIG;
 	}
 

@@ -163,7 +163,7 @@ int wl18xx_cmd_smart_config_set_group_key(struct wl1271 *wl, u16 group_id,
 	ret = wl1271_cmd_send(wl, CMD_SMART_CONFIG_SET_GROUP_KEY, cmd,
 			      sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send smart config set group key cmd");
+		dev_err(wl->dev, "failed to send smart config set group key cmd\n");
 		goto out_free;
 	}
 

@@ -195,7 +195,7 @@ int wl18xx_cmd_set_cac(struct wl1271 *wl, struct wl12xx_vif *wlvif, bool start)
 			      start ? CMD_CAC_START : CMD_CAC_STOP,
 			      cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send cac command");
+		dev_err(wl->dev, "failed to send cac command\n");
 		goto out_free;
 	}
 

@@ -221,7 +221,7 @@ int wl18xx_cmd_radar_detection_debug(struct wl1271 *wl, u8 channel)
 	ret = wl1271_cmd_send(wl, CMD_DFS_RADAR_DETECTION_DEBUG,
 			      cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send radar detection debug command");
+		dev_err(wl->dev, "failed to send radar detection debug command\n");
 		goto out_free;
 	}
 

@@ -247,7 +247,7 @@ int wl18xx_cmd_dfs_master_restart(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 	ret = wl1271_cmd_send(wl, CMD_DFS_MASTER_RESTART,
 			      cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send dfs master restart command");
+		dev_err(wl->dev, "failed to send dfs master restart command\n");
 		goto out_free;
 	}
 out_free:

index 4edfe28..57e1b19 100644
@@ -267,7 +267,7 @@ static ssize_t radar_detection_write(struct file *file,
 
 	ret = kstrtou8_from_user(user_buf, count, 10, &channel);
 	if (ret < 0) {
-		wl1271_warning("illegal channel");
+		dev_warn(wl->dev, "illegal channel\n");
 		return -EINVAL;
 	}
 

index 719907a..97c86c9 100644
@@ -117,7 +117,7 @@ static void wlcore_event_time_sync(struct wl1271 *wl, u16 tsf_msb, u16 tsf_lsb)
 	u32 clock;
 	/* convert the MSB+LSB to a u32 TSF value */
 	clock = (tsf_msb << 16) | tsf_lsb;
-	wl1271_info("TIME_SYNC_EVENT_ID: clock %u", clock);
+	dev_info(wl->dev, "TIME_SYNC_EVENT_ID: clock %u\n", clock);
 }
 
 int wl18xx_process_mailbox_events(struct wl1271 *wl)

@@ -142,9 +142,9 @@ int wl18xx_process_mailbox_events(struct wl1271 *wl)
 				mbox->time_sync_tsf_lsb);
 
 	if (vector & RADAR_DETECTED_EVENT_ID) {
-		wl1271_info("radar event: channel %d type %s",
-			    mbox->radar_channel,
-			    wl18xx_radar_type_decode(mbox->radar_type));
+		dev_info(wl->dev, "radar event: channel %d type %s\n",
+			 mbox->radar_channel,
+			 wl18xx_radar_type_decode(mbox->radar_type));
 
 		ieee80211_radar_detected(wl->hw);
 	}

147 lines not on this page · raw message

index bc15aa2..c64a443 100644
@@ -121,7 +121,7 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 				 0,
 				 false);
 		if (ret < 0) {
-			wl1271_error("2.4GHz PROBE request template failed");
+			dev_err(wl->dev, "2.4GHz PROBE request template failed\n");
 			goto out;
 		}
 	}

@@ -138,7 +138,7 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 				 0,
 				 false);
 		if (ret < 0) {
-			wl1271_error("5GHz PROBE request template failed");
+			dev_err(wl->dev, "5GHz PROBE request template failed\n");
 			goto out;
 		}
 	}

@@ -147,7 +147,7 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
 	ret = wl1271_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("SCAN failed");
+		dev_err(wl->dev, "SCAN failed\n");
 		goto out;
 	}
 

@@ -264,7 +264,7 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
 				 ies->common_ie_len,
 				 true);
 		if (ret < 0) {
-			wl1271_error("2.4GHz PROBE request template failed");
+			dev_err(wl->dev, "2.4GHz PROBE request template failed\n");
 			goto out;
 		}
 	}

@@ -281,7 +281,7 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
 				 ies->common_ie_len,
 				 true);
 		if (ret < 0) {
-			wl1271_error("5GHz PROBE request template failed");
+			dev_err(wl->dev, "5GHz PROBE request template failed\n");
 			goto out;
 		}
 	}

@@ -290,7 +290,7 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
 
 	ret = wl1271_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("SCAN failed");
+		dev_err(wl->dev, "SCAN failed\n");
 		goto out;
 	}
 

@@ -317,7 +317,7 @@ static int __wl18xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
 	stop = kzalloc(sizeof(*stop), GFP_KERNEL);
 	if (!stop) {
-		wl1271_error("failed to alloc memory to send sched scan stop");
+		dev_err(wl->dev, "failed to alloc memory to send sched scan stop\n");
 		return -ENOMEM;
 	}
 

@@ -326,7 +326,7 @@ static int __wl18xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
 	ret = wl1271_cmd_send(wl, CMD_STOP_SCAN, stop, sizeof(*stop), 0);
 	if (ret < 0) {
-		wl1271_error("failed to send sched scan stop command");
+		dev_err(wl->dev, "failed to send sched scan stop command\n");
 		goto out_free;
 	}
 

index 3406ffb..cef7f31 100644
@@ -35,7 +35,7 @@ void wl18xx_get_last_tx_rate(struct wl1271 *wl, struct ieee80211_vif *vif,
 	u8 fw_rate = wl->fw_status->counters.tx_last_rate;
 
 	if (fw_rate > CONF_HW_RATE_INDEX_MAX) {
-		wl1271_error("last Tx rate invalid: %d", fw_rate);
+		dev_err(wl->dev, "last Tx rate invalid: %d\n", fw_rate);
 		rate->idx = 0;
 		rate->flags = 0;
 		return;

@@ -82,7 +82,7 @@ static void wl18xx_tx_complete_packet(struct wl1271 *wl, u8 tx_stat_byte)
 
 	/* check for id legality */
 	if (unlikely(id >= wl->num_tx_desc || wl->tx_frames[id] == NULL)) {
-		wl1271_warning("illegal id in tx completion: %d", id);
+		dev_warn(wl->dev, "illegal id in tx completion: %d\n", id);
 		return;
 	}
 

@@ -155,8 +155,8 @@ void wl18xx_tx_immediate_complete(struct wl1271 *wl)
 		     priv->last_fw_rls_idx, status_priv->fw_release_idx);
 
 	if (status_priv->fw_release_idx >= WL18XX_FW_MAX_TX_STATUS_DESC) {
-		wl1271_error("invalid desc release index %d",
-			     status_priv->fw_release_idx);
+		dev_err(wl->dev, "invalid desc release index %d\n",
+			status_priv->fw_release_idx);
 		WARN_ON(1);
 		return;
 	}

473 lines not on this page · raw message

128 lines not on this page · raw message

377 lines not on this page · raw message

index 27bfb7c..90d3aad 100644
@@ -61,18 +61,6 @@ extern u32 wl12xx_debug_level;
 
 #define DEBUG_DUMP_LIMIT 1024
 
-#define wl1271_error(fmt, arg...) \
-	pr_err(DRIVER_PREFIX "ERROR " fmt "\n", ##arg)
-
-#define wl1271_warning(fmt, arg...) \
-	pr_warn(DRIVER_PREFIX "WARNING " fmt "\n", ##arg)
-
-#define wl1271_notice(fmt, arg...) \
-	pr_info(DRIVER_PREFIX fmt "\n", ##arg)
-
-#define wl1271_info(fmt, arg...) \
-	pr_info(DRIVER_PREFIX fmt "\n", ##arg)
-
 /* define the debug macro differently if dynamic debug is supported */
 #if defined(CONFIG_DYNAMIC_DEBUG)
 #define wl1271_debug(level, fmt, arg...) \

@@ -84,7 +72,7 @@ extern u32 wl12xx_debug_level;
 #define wl1271_debug(level, fmt, arg...) \
 	do { \
 		if (unlikely(level & wl12xx_debug_level)) \
-			printk(KERN_DEBUG pr_fmt(DRIVER_PREFIX fmt "\n"), \
+			printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", \
 			       ##arg); \
 	} while (0)
 #endif

188 lines not on this page · raw message

index 4b59f67..27d9c26 100644
@@ -53,7 +53,7 @@ int wlcore_event_fw_logger(struct wl1271 *wl)
 
 	buffer = kzalloc(WL18XX_LOGGER_SDIO_BUFF_MAX, GFP_KERNEL);
 	if (!buffer) {
-		wl1271_error("Fail to allocate fw logger memory");
+		dev_err(wl->dev, "Fail to allocate fw logger memory\n");
 		fw_log.actual_buff_size = cpu_to_le32(0);
 		goto out;
 	}

@@ -61,8 +61,8 @@ int wlcore_event_fw_logger(struct wl1271 *wl)
 	ret = wlcore_read(wl, addr, buffer, WL18XX_LOGGER_SDIO_BUFF_MAX,
 			  false);
 	if (ret < 0) {
-		wl1271_error("Fail to read logger buffer, error_id = %d",
-			     ret);
+		dev_err(wl->dev, "Fail to read logger buffer, error_id = %d\n",
+			ret);
 		fw_log.actual_buff_size = cpu_to_le32(0);
 		goto free_out;
 	}

@@ -97,8 +97,8 @@ int wlcore_event_fw_logger(struct wl1271 *wl)
 
 	/* double check that clear address and write pointer are the same */
 	if (clear_addr != le32_to_cpu(fw_log.buff_write_ptr)) {
-		wl1271_error("Calculate of clear addr Clear = %x, write = %x",
-			     clear_addr, le32_to_cpu(fw_log.buff_write_ptr));
+		dev_err(wl->dev, "Calculate of clear addr Clear = %x, write = %x\n",
+			clear_addr, le32_to_cpu(fw_log.buff_write_ptr));
 	}
 
 	/* indicate FW about Clear buffer */

@@ -246,7 +246,7 @@ EXPORT_SYMBOL_GPL(wlcore_event_channel_switch);
 void wlcore_event_dummy_packet(struct wl1271 *wl)
 {
 	if (wl->plt) {
-		wl1271_info("Got DUMMY_PACKET event in PLT mode.  FW bug, ignoring.");
+		dev_info(wl->dev, "Got DUMMY_PACKET event in PLT mode.  FW bug, ignoring.\n");
 		return;
 	}
 

@@ -322,7 +322,7 @@ void wlcore_event_beacon_loss(struct wl1271 *wl, unsigned long roles_bitmap)
 	int delay = wl->conf.conn.synch_fail_thold *
 				wl->conf.conn.bss_lose_timeout;
 
-	wl1271_info("Beacon loss detected. roles:0x%lx", roles_bitmap);
+	dev_info(wl->dev, "Beacon loss detected. roles:0x%lx\n", roles_bitmap);
 
 	wl12xx_for_each_wlvif_sta(wl, wlvif) {
 		if (wlvif->role_id == WL12XX_INVALID_ROLE_ID ||

797 lines not on this page · raw message

index 4cd316e..bfd5a8f 100644
@@ -148,7 +148,7 @@ int wl1271_ps_elp_wakeup(struct wl1271 *wl)
 		ret = wait_for_completion_timeout(
 			&compl, msecs_to_jiffies(WL1271_WAKEUP_TIMEOUT));
 		if (ret == 0) {
-			wl1271_error("ELP wakeup timeout!");
+			dev_err(wl->dev, "ELP wakeup timeout!\n");
 			wl12xx_queue_recovery_work(wl);
 			ret = -ETIMEDOUT;
 			goto err;

@@ -188,7 +188,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 					    wl->conf.conn.wake_up_event,
 					    wl->conf.conn.listen_interval);
 		if (ret < 0) {
-			wl1271_error("couldn't set wake up conditions");
+			dev_err(wl->dev, "couldn't set wake up conditions\n");
 			return ret;
 		}
 

@@ -227,7 +227,8 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 		clear_bit(WLVIF_FLAG_IN_PS, &wlvif->flags);
 		break;
 	default:
-		wl1271_warning("trying to set ps to unsupported mode %d", mode);
+		dev_warn(wl->dev, "trying to set ps to unsupported mode %d\n",
+			 mode);
 		ret = -EINVAL;
 	}
 

@@ -290,8 +291,8 @@ void wl12xx_ps_link_start(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 	rcu_read_lock();
 	sta = ieee80211_find_sta(vif, wl->links[hlid].addr);
 	if (!sta) {
-		wl1271_error("could not find sta %pM for starting ps",
-			     wl->links[hlid].addr);
+		dev_err(wl->dev, "could not find sta %pM for starting ps\n",
+			wl->links[hlid].addr);
 		rcu_read_unlock();
 		return;
 	}

@@ -321,8 +322,8 @@ void wl12xx_ps_link_end(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid)
 	rcu_read_lock();
 	sta = ieee80211_find_sta(vif, wl->links[hlid].addr);
 	if (!sta) {
-		wl1271_error("could not find sta %pM for ending ps",
-			     wl->links[hlid].addr);
+		dev_err(wl->dev, "could not find sta %pM for ending ps\n",
+			wl->links[hlid].addr);
 		goto end;
 	}
 

index 34e7e93..e5c25254 100644
@@ -101,8 +101,8 @@ static void wl1271_rx_status(struct wl1271 *wl,
 
 		if (unlikely(desc_err_code & WL1271_RX_DESC_MIC_FAIL)) {
 			status->flag |= RX_FLAG_MMIC_ERROR;
-			wl1271_warning("Michael MIC error. Desc: 0x%x",
-				       desc_err_code);
+			dev_warn(wl->dev, "Michael MIC error. Desc: 0x%x\n",
+				 desc_err_code);
 		}
 	}
 

@@ -133,8 +133,8 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
 
 	pkt_data_len = wlcore_hw_get_rx_packet_len(wl, data, length);
 	if (!pkt_data_len) {
-		wl1271_error("Invalid packet arrived from HW. length %d",
-			     length);
+		dev_err(wl->dev, "Invalid packet arrived from HW. length %d\n",
+			length);
 		return -EINVAL;
 	}
 

@@ -155,9 +155,9 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
 	/* discard corrupted packets */
 	if (desc->status & WL1271_RX_DESC_DECRYPT_FAIL) {
 		hdr = (void *)(data + sizeof(*desc) + offset_to_data);
-		wl1271_warning("corrupted packet in RX: status: 0x%x len: %d",
-			       desc->status & WL1271_RX_DESC_STATUS_MASK,
-			       pkt_data_len);
+		dev_warn(wl->dev, "corrupted packet in RX: status: 0x%x len: %d\n",
+			 desc->status & WL1271_RX_DESC_STATUS_MASK,
+			 pkt_data_len);
 		wl1271_dump((DEBUG_RX|DEBUG_CMD), "PKT: ", data + sizeof(*desc),
 			    min(pkt_data_len,
 				ieee80211_hdrlen(hdr->frame_control)));

@@ -167,7 +167,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
 	/* skb length not including rx descriptor */
 	skb = __dev_alloc_skb(pkt_data_len + reserved, GFP_KERNEL);
 	if (!skb) {
-		wl1271_error("Couldn't allocate RX frame");
+		dev_err(wl->dev, "Couldn't allocate RX frame\n");
 		return -ENOMEM;
 	}
 

@@ -238,7 +238,7 @@ int wlcore_rx(struct wl1271 *wl, struct wl_fw_status *status)
 		}
 
 		if (buf_size == 0) {
-			wl1271_warning("received empty data");
+			dev_warn(wl->dev, "received empty data\n");
 			break;
 		}
 

@@ -309,16 +309,16 @@ int wl1271_rx_filter_enable(struct wl1271 *wl,
 	int ret;
 
 	if (!!test_bit(index, wl->rx_filter_enabled) == enable) {
-		wl1271_warning("Request to enable an already "
-			     "enabled rx filter %d", index);
+		dev_warn(wl->dev, "Request to enable an already enabled rx filter %d\n",
+			 index);
 		return 0;
 	}
 
 	ret = wl1271_acx_set_rx_filter(wl, index, enable, filter);
 
 	if (ret) {
-		wl1271_error("Failed to %s rx data filter %d (err=%d)",
-			     enable ? "enable" : "disable", index, ret);
+		dev_err(wl->dev, "Failed to %s rx data filter %d (err=%d)\n",
+			enable ? "enable" : "disable", index, ret);
 		return ret;
 	}
 

index 1e3d51c..2f50cf3 100644
@@ -76,7 +76,7 @@ void wl1271_scan_complete_work(struct work_struct *work)
 	wl1271_ps_elp_sleep(wl);
 
 	if (wl->scan.failed) {
-		wl1271_info("Scan completed due to error.");
+		dev_info(wl->dev, "Scan completed due to error\n");
 		wl12xx_queue_recovery_work(wl);
 	}
 

@@ -466,7 +466,7 @@ wlcore_scan_sched_scan_ssid_list(struct wl1271 *wl,
 	ret = wl1271_cmd_send(wl, CMD_CONNECTION_SCAN_SSID_CFG, cmd,
 			      sizeof(*cmd), 0);
 	if (ret < 0) {
-		wl1271_error("cmd sched scan ssid list failed");
+		dev_err(wl->dev, "cmd sched scan ssid list failed\n");
 		goto out_free;
 	}
 

index a9218e5..1487398 100644
@@ -52,7 +52,7 @@ static ssize_t wl1271_sysfs_store_bt_coex_state(struct device *dev,
 
 	ret = kstrtoul(buf, 10, &res);
 	if (ret < 0) {
-		wl1271_warning("incorrect value written to bt_coex_mode");
+		dev_warn(wl->dev, "incorrect value written to bt_coex_mode\n");
 		return count;
 	}
 

@@ -150,21 +150,21 @@ int wlcore_sysfs_init(struct wl1271 *wl)
 	/* Create sysfs file to control bt coex state */
 	ret = device_create_file(wl->dev, &dev_attr_bt_coex_state);
 	if (ret < 0) {
-		wl1271_error("failed to create sysfs file bt_coex_state");
+		dev_err(wl->dev, "failed to create sysfs file bt_coex_state\n");
 		goto out;
 	}
 
 	/* Create sysfs file to get HW PG version */
 	ret = device_create_file(wl->dev, &dev_attr_hw_pg_ver);
 	if (ret < 0) {
-		wl1271_error("failed to create sysfs file hw_pg_ver");
+		dev_err(wl->dev, "failed to create sysfs file hw_pg_ver\n");
 		goto out_bt_coex_state;
 	}
 
 	/* Create sysfs file for the FW log */
 	ret = device_create_bin_file(wl->dev, &fwlog_attr);
 	if (ret < 0) {
-		wl1271_error("failed to create sysfs file fwlog");
+		dev_err(wl->dev, "failed to create sysfs file fwlog\n");
 		goto out_hw_pg_ver;
 	}
 

index ddad58f..6165c29 100644
@@ -103,7 +103,7 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
 
 	ret = wl1271_cmd_test(wl, buf, buf_len, answer);
 	if (ret < 0) {
-		wl1271_warning("testmode cmd test failed: %d", ret);
+		dev_warn(wl->dev, "testmode cmd test failed: %d\n", ret);
 		goto out_sleep;
 	}
 

@@ -116,11 +116,11 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
 
 		if (params->test.id == TEST_CMD_P2G_CAL &&
 		    radio_status < 0)
-			wl1271_warning("testmode cmd: radio status=%d",
-					radio_status);
+			dev_warn(wl->dev, "testmode cmd: radio status=%d\n",
+				 radio_status);
 		else
-			wl1271_info("testmode cmd: radio status=%d",
-					radio_status);
+			dev_info(wl->dev, "testmode cmd: radio status=%d\n",
+				 radio_status);
 
 		len = nla_total_size(buf_len);
 		skb = cfg80211_testmode_alloc_reply_skb(wl->hw->wiphy, len);

@@ -182,7 +182,7 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[])
 	ret = wl1271_cmd_interrogate(wl, ie_id, cmd,
 				     sizeof(struct acx_header), sizeof(*cmd));
 	if (ret < 0) {
-		wl1271_warning("testmode cmd interrogate failed: %d", ret);
+		dev_warn(wl->dev, "testmode cmd interrogate failed: %d\n", ret);
 		goto out_free;
 	}
 

@@ -237,7 +237,7 @@ static int wl1271_tm_cmd_configure(struct wl1271 *wl, struct nlattr *tb[])
 	mutex_unlock(&wl->mutex);
 
 	if (ret < 0) {
-		wl1271_warning("testmode cmd configure failed: %d", ret);
+		dev_warn(wl->dev, "testmode cmd configure failed: %d\n", ret);
 		return ret;
 	}
 

index f0ac361..5442e32 100644
@@ -384,12 +384,12 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 	bool is_gem = false;
 
 	if (!skb) {
-		wl1271_error("discarding null skb");
+		dev_err(wl->dev, "discarding null skb\n");
 		return -EINVAL;
 	}
 
 	if (hlid == WL12XX_INVALID_LINK_ID) {
-		wl1271_error("invalid hlid. dropping skb 0x%p", skb);
+		dev_err(wl->dev, "invalid hlid - dropping skb 0x%p\n", skb);
 		return -EINVAL;
 	}
 

@@ -921,7 +921,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
 
 	/* check for id legality */
 	if (unlikely(id >= wl->num_tx_desc || wl->tx_frames[id] == NULL)) {
-		wl1271_warning("TX result illegal id: %d", id);
+		dev_warn(wl->dev, "TX result illegal id: %d\n", id);
 		return;
 	}
 

@@ -1009,7 +1009,8 @@ int wlcore_tx_complete(struct wl1271 *wl)
 
 	/* verify that the result buffer is not getting overrun */
 	if (unlikely(count > TX_HW_RESULT_QUEUE_LEN))
-		wl1271_warning("TX result overflow from chipset: %d", count);
+		dev_warn(wl->dev, "TX result overflow from chipset: %d\n",
+			 count);
 
 	/* process the results */
 	for (i = 0; i < count; i++) {

@@ -1182,9 +1183,8 @@ void wl1271_tx_flush(struct wl1271 *wl)
 		}
 	}
 
-	wl1271_warning("Unable to flush all TX buffers, "
-		       "timed out (timeout %d ms",
-		       WL1271_TX_FLUSH_TIMEOUT / 1000);
+	dev_warn(wl->dev, "Unable to flush all TX buffers, timed out (timeout %d ms\n",
+		 WL1271_TX_FLUSH_TIMEOUT / 1000);
 
 	/* forcibly flush all Tx buffers on our queues */
 	for (i = 0; i < wl->num_links; i++)

index 27c5687..bd63cac 100644
@@ -529,9 +529,6 @@ int wl1271_plt_stop(struct wl1271 *wl);
 int wl1271_recalc_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wl12xx_queue_recovery_work(struct wl1271 *wl);
 size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen);
-int wl1271_rx_filter_alloc_field(struct wl12xx_rx_filter *filter,
-				 u16 offset, u8 flags,
-				 const u8 *pattern, u8 len);
 void wl1271_rx_filter_free(struct wl12xx_rx_filter *filter);
 struct wl12xx_rx_filter *wl1271_rx_filter_alloc(void);
 int wl1271_rx_filter_get_fields_size(struct wl12xx_rx_filter *filter);

index d6fbdda..23b4882 100644
@@ -28,7 +28,7 @@ int wl1251_acx_frame_rates(struct wl1251 *wl, u8 ctrl_rate, u8 ctrl_mod,
 	ret = wl1251_cmd_configure(wl, ACX_FW_GEN_FRAME_RATES,
 				   rates, sizeof(*rates));
 	if (ret < 0) {
-		wl1251_error("Failed to set FW rates and modulation");
+		wiphy_err(wl->hw->wiphy, "Failed to set FW rates and modulation\n");
 		goto out;
 	}
 

@@ -74,7 +74,7 @@ int wl1251_acx_default_key(struct wl1251 *wl, u8 key_id)
 	ret = wl1251_cmd_configure(wl, DOT11_DEFAULT_KEY,
 				   default_key, sizeof(*default_key));
 	if (ret < 0) {
-		wl1251_error("Couldn't set default key");
+		wiphy_err(wl->hw->wiphy, "Couldn't set default key\n");
 		goto out;
 	}
 

@@ -208,7 +208,7 @@ int wl1251_acx_feature_cfg(struct wl1251 *wl, u32 data_flow_options)
 	ret = wl1251_cmd_configure(wl, ACX_FEATURE_CFG,
 				   feature, sizeof(*feature));
 	if (ret < 0) {
-		wl1251_error("Couldn't set HW encryption");
+		wiphy_err(wl->hw->wiphy, "Couldn't set HW encryption\n");
 		goto out;
 	}
 

index 2000cd5..456629a 100644
@@ -53,7 +53,7 @@ int wl1251_boot_soft_reset(struct wl1251 *wl)
 		if (time_after(jiffies, timeout)) {
 			/* 1.2 check pWhalBus->uSelfClearTime if the
 			 * timeout was reached */
-			wl1251_error("soft reset timeout");
+			wiphy_err(wl->hw->wiphy, "soft reset timeout\n");
 			return -1;
 		}
 

@@ -231,7 +231,7 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
 	wl1251_debug(DEBUG_BOOT, "chip id after firmware boot: 0x%x", chip_id);
 
 	if (chip_id != wl->chip_id) {
-		wl1251_error("chip id doesn't match after firmware boot");
+		wiphy_err(wl->hw->wiphy, "chip id doesn't match after firmware boot\n");
 		return -EIO;
 	}
 

@@ -242,8 +242,7 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
 		acx_intr = wl1251_reg_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);
 
 		if (acx_intr == 0xffffffff) {
-			wl1251_error("error reading hardware complete "
-				     "init indication");
+			wiphy_err(wl->hw->wiphy, "error reading hardware complete init indication\n");
 			return -EIO;
 		}
 		/* check that ACX_INTR_INIT_COMPLETE is enabled */

@@ -255,8 +254,7 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
 	}
 
 	if (loop > INIT_LOOP) {
-		wl1251_error("timeout waiting for the hardware to "
-			     "complete initialization");
+		wiphy_err(wl->hw->wiphy, "timeout waiting for the hardware to complete initialization\n");
 		return -EIO;
 	}
 

@@ -304,7 +302,7 @@ int wl1251_boot_run_firmware(struct wl1251 *wl)
 
 	ret = wl1251_event_unmask(wl);
 	if (ret < 0) {
-		wl1251_error("EVENT mask setting failed");
+		wiphy_err(wl->hw->wiphy, "EVENT mask setting failed\n");
 		return ret;
 	}
 

@@ -333,13 +331,13 @@ static int wl1251_boot_upload_firmware(struct wl1251 *wl)
 		CHUNK_SIZE);
 
 	if ((fw_data_len % 4) != 0) {
-		wl1251_error("firmware length not multiple of four");
+		wiphy_err(wl->hw->wiphy, "firmware length not multiple of four\n");
 		return -EIO;
 	}
 
 	buf = kmalloc(CHUNK_SIZE, GFP_KERNEL);
 	if (!buf) {
-		wl1251_error("allocation for firmware upload chunk failed");
+		wiphy_err(wl->hw->wiphy, "allocation for firmware upload chunk failed\n");
 		return -ENOMEM;
 	}
 

@@ -536,7 +534,7 @@ int wl1251_boot(struct wl1251 *wl)
 	 * pWhalBus->uBootData and start uploading firmware
 	 */
 	if ((boot_data & ECPU_CONTROL_HALT) == 0) {
-		wl1251_error("boot failed, ECPU_CONTROL_HALT not set");
+		wiphy_err(wl->hw->wiphy, "boot failed, ECPU_CONTROL_HALT not set\n");
 		ret = -EIO;
 		goto out;
 	}

126 lines not on this page · raw message

index c986303..3939734 100644
@@ -68,7 +68,7 @@ static int wl1251_event_ps_report(struct wl1251 *wl,
 			wl->psm_entry_retry++;
 			ret = wl1251_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
 		} else {
-			wl1251_error("Power save entry failed, giving up");
+			wiphy_err(wl->hw->wiphy, "Power save entry failed, giving up\n");
 			wl->psm_entry_retry = 0;
 		}
 		break;

index 1d799bf..b1fedb9 100644
@@ -211,7 +211,7 @@ int wl1251_hw_init_mem_config(struct wl1251 *wl)
 	wl->target_mem_map = kzalloc(sizeof(struct wl1251_acx_mem_map),
 					  GFP_KERNEL);
 	if (!wl->target_mem_map) {
-		wl1251_error("couldn't allocate target memory map");
+		wiphy_err(wl->hw->wiphy, "couldn't allocate target memory map\n");
 		return -ENOMEM;
 	}
 

@@ -219,7 +219,7 @@ int wl1251_hw_init_mem_config(struct wl1251 *wl)
 	ret = wl1251_acx_mem_map(wl, wl->target_mem_map,
 				 sizeof(struct wl1251_acx_mem_map));
 	if (ret < 0) {
-		wl1251_error("couldn't retrieve firmware memory map");
+		wiphy_err(wl->hw->wiphy, "couldn't retrieve firmware memory map\n");
 		kfree(wl->target_mem_map);
 		wl->target_mem_map = NULL;
 		return ret;

@@ -228,7 +228,8 @@ int wl1251_hw_init_mem_config(struct wl1251 *wl)
 	return 0;
 }
 
-static int wl1251_hw_init_txq_fill(u8 qid,
+static int wl1251_hw_init_txq_fill(struct wl1251 *wl,
+				   u8 qid,
 				   struct acx_tx_queue_qos_config *config,
 				   u32 num_blocks)
 {

@@ -260,7 +261,7 @@ static int wl1251_hw_init_txq_fill(u8 qid,
 			(QOS_TX_LOW_VO_DEF * num_blocks) / 100;
 		break;
 	default:
-		wl1251_error("Invalid TX queue id: %d", qid);
+		wiphy_err(wl->hw->wiphy, "Invalid TX queue id: %d\n", qid);
 		return -EINVAL;
 	}
 

@@ -282,7 +283,7 @@ static int wl1251_hw_init_tx_queue_config(struct wl1251 *wl)
 	}
 
 	for (i = 0; i < MAX_NUM_OF_AC; i++) {
-		ret = wl1251_hw_init_txq_fill(i, config,
+		ret = wl1251_hw_init_txq_fill(wl, i, config,
 					      wl_mem_map->num_tx_mem_blocks);
 		if (ret < 0)
 			goto out;

@@ -311,7 +312,7 @@ static int wl1251_hw_init_data_path_config(struct wl1251 *wl)
 	wl->data_path = kzalloc(sizeof(struct acx_data_path_params_resp),
 				GFP_KERNEL);
 	if (!wl->data_path) {
-		wl1251_error("Couldnt allocate data path parameters");
+		wiphy_err(wl->hw->wiphy, "Couldnt allocate data path parameters\n");
 		return -ENOMEM;
 	}
 

index cdcadbf..36ead14 100644
@@ -46,7 +46,8 @@ static int wl1251_translate_reg_addr(struct wl1251 *wl, int addr)
 	if (addr < REGISTERS_BASE) {
 		/* Make sure we don't go over the table */
 		if (addr >= ACX_REG_TABLE_LEN) {
-			wl1251_error("address out of range (%d)", addr);
+			wiphy_err(wl->hw->wiphy, "address out of range (%d)\n",
+				  addr);
 			return -EINVAL;
 		}
 		addr = wl1251_io_reg_table[addr];

133 lines not on this page · raw message

index b9e27b9..d84762d 100644
@@ -88,7 +88,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)
 	 */
 	while (!(elp_reg & ELPCTRL_WLAN_READY)) {
 		if (time_after(jiffies, timeout)) {
-			wl1251_error("elp wakeup timeout");
+			wiphy_err(wl->hw->wiphy, "elp wakeup timeout\n");
 			return -ETIMEDOUT;
 		}
 		msleep(1);

index cde0eaf..0176656 100644
@@ -172,7 +172,7 @@ static void wl1251_rx_body(struct wl1251 *wl,
 
 	skb = __dev_alloc_skb(length, GFP_KERNEL);
 	if (!skb) {
-		wl1251_error("Couldn't allocate RX frame");
+		wiphy_err(wl->hw->wiphy, "Couldn't allocate RX frame\n");
 		return;
 	}
 

index b661f89..f48e985 100644
@@ -19,6 +19,9 @@
  * Copyright (C) 2008 Google Inc
  * Copyright (C) 2009 Bob Copeland ([email protected])
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>

@@ -77,7 +80,7 @@ static void wl1251_sdio_read(struct wl1251 *wl, int addr,
 	sdio_claim_host(func);
 	ret = sdio_memcpy_fromio(func, buf, addr, len);
 	if (ret)
-		wl1251_error("sdio read failed (%d)", ret);
+		wiphy_err(wl->hw->wiphy, "sdio read failed (%d)\n", ret);
 	sdio_release_host(func);
 }
 

@@ -90,7 +93,7 @@ static void wl1251_sdio_write(struct wl1251 *wl, int addr,
 	sdio_claim_host(func);
 	ret = sdio_memcpy_toio(func, addr, buf, len);
 	if (ret)
-		wl1251_error("sdio write failed (%d)", ret);
+		wiphy_err(wl->hw->wiphy, "sdio write failed (%d)\n", ret);
 	sdio_release_host(func);
 }
 

@@ -111,7 +114,7 @@ static void wl1251_sdio_read_elp(struct wl1251 *wl, int addr, u32 *val)
 	sdio_release_host(func);
 
 	if (ret)
-		wl1251_error("sdio_readb failed (%d)", ret);
+		wiphy_err(wl->hw->wiphy, "sdio_readb failed (%d)\n", ret);
 }
 
 static void wl1251_sdio_write_elp(struct wl1251 *wl, int addr, u32 val)

@@ -125,7 +128,7 @@ static void wl1251_sdio_write_elp(struct wl1251 *wl, int addr, u32 val)
 	sdio_release_host(func);
 
 	if (ret)
-		wl1251_error("sdio_writeb failed (%d)", ret);
+		wiphy_err(wl->hw->wiphy, "sdio_writeb failed (%d)\n", ret);
 	else
 		wl_sdio->elp_val = val;
 }

@@ -267,7 +270,8 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 		ret = devm_gpio_request(&func->dev, wl->power_gpio,
 								"wl1251 power");
 		if (ret) {
-			wl1251_error("Failed to request gpio: %d\n", ret);
+			wiphy_err(wl->hw->wiphy, "Failed to request gpio: %d\n",
+				  ret);
 			goto disable;
 		}
 	}

@@ -276,7 +280,8 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 		irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
 		ret = request_irq(wl->irq, wl1251_line_irq, 0, "wl1251", wl);
 		if (ret < 0) {
-			wl1251_error("request_irq() failed: %d", ret);
+			wiphy_err(wl->hw->wiphy, "request_irq() failed: %d\n",
+				  ret);
 			goto disable;
 		}
 

@@ -370,7 +375,7 @@ static int __init wl1251_sdio_init(void)
 
 	err = sdio_register_driver(&wl1251_sdio_driver);
 	if (err)
-		wl1251_error("failed to register sdio driver: %d", err);
+		pr_err("failed to register sdio driver: %d\n", err);
 	return err;
 }
 

index 8de9d44..d8b7dc8 100644
@@ -62,7 +62,7 @@ static void wl1251_spi_reset(struct wl1251 *wl)
 
 	cmd = kzalloc(WSPI_INIT_CMD_LEN, GFP_KERNEL);
 	if (!cmd) {
-		wl1251_error("could not allocate cmd for spi reset");
+		wiphy_err(wl->hw->wiphy, "could not allocate cmd for spi reset\n");
 		return;
 	}
 

@@ -89,7 +89,7 @@ static void wl1251_spi_wake(struct wl1251 *wl)
 	u8 *cmd = kzalloc(WSPI_INIT_CMD_LEN, GFP_KERNEL);
 
 	if (!cmd) {
-		wl1251_error("could not allocate cmd for spi init");
+		wiphy_err(wl->hw->wiphy, "could not allocate cmd for spi init\n");
 		return;
 	}
 

@@ -247,7 +247,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
 	int ret;
 
 	if (!np && !pdata) {
-		wl1251_error("no platform data");
+		wiphy_err(wl->hw->wiphy, "no platform data\n");
 		return -ENODEV;
 	}
 

@@ -269,7 +269,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
 
 	ret = spi_setup(spi);
 	if (ret < 0) {
-		wl1251_error("spi_setup failed");
+		wiphy_err(wl->hw->wiphy, "spi_setup failed\n");
 		goto out_free;
 	}
 

@@ -290,18 +290,19 @@ static int wl1251_spi_probe(struct spi_device *spi)
 		ret = devm_gpio_request_one(&spi->dev, wl->power_gpio,
 					GPIOF_OUT_INIT_LOW, "wl1251 power");
 		if (ret) {
-			wl1251_error("Failed to request gpio: %d\n", ret);
+			wiphy_err(wl->hw->wiphy, "Failed to request gpio: %d\n",
+				  ret);
 			goto out_free;
 		}
 	} else {
-		wl1251_error("set power gpio missing in platform data");
+		wiphy_err(wl->hw->wiphy, "set power gpio missing in platform data\n");
 		ret = -ENODEV;
 		goto out_free;
 	}
 
 	wl->irq = spi->irq;
 	if (wl->irq < 0) {
-		wl1251_error("irq missing in platform data");
+		wiphy_err(wl->hw->wiphy, "irq missing in platform data\n");
 		ret = -ENODEV;
 		goto out_free;
 	}

@@ -310,7 +311,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
 	ret = devm_request_irq(&spi->dev, wl->irq, wl1251_irq, 0,
 							DRIVER_NAME, wl);
 	if (ret < 0) {
-		wl1251_error("request_irq() failed: %d", ret);
+		wiphy_err(wl->hw->wiphy, "request_irq() failed: %d\n", ret);
 		goto out_free;
 	}
 

@@ -319,7 +320,7 @@ static int wl1251_spi_probe(struct spi_device *spi)
 	wl->vio = devm_regulator_get(&spi->dev, "vio");
 	if (IS_ERR(wl->vio)) {
 		ret = PTR_ERR(wl->vio);
-		wl1251_error("vio regulator missing: %d", ret);
+		wiphy_err(wl->hw->wiphy, "vio regulator missing: %d\n", ret);
 		goto out_free;
 	}
 

index 81de83c..0aa2d54 100644
@@ -223,7 +223,7 @@ static int wl1251_tx_send_packet(struct wl1251 *wl, struct sk_buff *skb,
 								 GFP_KERNEL);
 
 			if (unlikely(newskb == NULL)) {
-				wl1251_error("Can't allocate skb!");
+				wiphy_err(wl->hw->wiphy, "Can't allocate skb!\n");
 				return -EINVAL;
 			}
 

@@ -419,7 +419,8 @@ static void wl1251_tx_packet_cb(struct wl1251 *wl,
 
 	skb = wl->tx_frames[result->id];
 	if (skb == NULL) {
-		wl1251_error("SKB for packet %d is NULL", result->id);
+		wiphy_err(wl->hw->wiphy, "SKB for packet %d is NULL\n",
+			  result->id);
 		return;
 	}
 

index 16dae52..2fdb194 100644
@@ -54,9 +54,6 @@ enum {
 
 #define DEBUG_DUMP_LIMIT 1024
 
-#define wl1251_error(fmt, arg...) \
-	printk(KERN_ERR DRIVER_PREFIX "ERROR " fmt "\n", ##arg)
-
 #define wl1251_warning(fmt, arg...) \
 	printk(KERN_WARNING DRIVER_PREFIX "WARNING " fmt "\n", ##arg)
 

index 23b4882..22d3daa 100644
@@ -103,7 +103,8 @@ int wl1251_acx_wake_up_conditions(struct wl1251 *wl, u8 wake_up_event,
 	ret = wl1251_cmd_configure(wl, ACX_WAKE_UP_CONDITIONS,
 				   wake_up, sizeof(*wake_up));
 	if (ret < 0) {
-		wl1251_warning("could not set wake up conditions: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "could not set wake up conditions: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -144,7 +145,7 @@ int wl1251_acx_fw_version(struct wl1251 *wl, char *buf, size_t len)
 
 	ret = wl1251_cmd_interrogate(wl, ACX_FW_REV, rev, sizeof(*rev));
 	if (ret < 0) {
-		wl1251_warning("ACX_FW_REV interrogate failed");
+		wiphy_warn(wl->hw->wiphy, "ACX_FW_REV interrogate failed\n");
 		goto out;
 	}
 

@@ -181,7 +182,8 @@ int wl1251_acx_tx_power(struct wl1251 *wl, int power)
 
 	ret = wl1251_cmd_configure(wl, DOT11_CUR_TX_PWR, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("configure of tx power failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "configure of tx power failed: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -265,10 +267,11 @@ int wl1251_acx_data_path_params(struct wl1251 *wl,
 				     resp, sizeof(*resp));
 
 	if (ret < 0) {
-		wl1251_warning("failed to read data path parameters: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to read data path parameters: %d\n",
+			   ret);
 		goto out;
 	} else if (resp->header.cmd.status != CMD_STATUS_SUCCESS) {
-		wl1251_warning("data path parameter acx status failed");
+		wiphy_warn(wl->hw->wiphy, "data path parameter acx status failed\n");
 		ret = -EIO;
 		goto out;
 	}

@@ -293,7 +296,8 @@ int wl1251_acx_rx_msdu_life_time(struct wl1251 *wl, u32 life_time)
 	ret = wl1251_cmd_configure(wl, DOT11_RX_MSDU_LIFE_TIME,
 				   acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("failed to set rx msdu life time: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set rx msdu life time: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -319,7 +323,7 @@ int wl1251_acx_rx_config(struct wl1251 *wl, u32 config, u32 filter)
 	ret = wl1251_cmd_configure(wl, ACX_RX_CFG,
 				   rx_config, sizeof(*rx_config));
 	if (ret < 0) {
-		wl1251_warning("failed to set rx config: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set rx config: %d\n", ret);
 		goto out;
 	}
 

@@ -343,7 +347,8 @@ int wl1251_acx_pd_threshold(struct wl1251 *wl)
 
 	ret = wl1251_cmd_configure(wl, ACX_PD_THRESHOLD, pd, sizeof(*pd));
 	if (ret < 0) {
-		wl1251_warning("failed to set pd threshold: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set pd threshold: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -368,7 +373,8 @@ int wl1251_acx_slot(struct wl1251 *wl, enum acx_slot_type slot_time)
 
 	ret = wl1251_cmd_configure(wl, ACX_SLOT, slot, sizeof(*slot));
 	if (ret < 0) {
-		wl1251_warning("failed to set slot time: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set slot time: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -397,7 +403,8 @@ int wl1251_acx_group_address_tbl(struct wl1251 *wl, bool enable,
 	ret = wl1251_cmd_configure(wl, DOT11_GROUP_ADDRESS_TBL,
 				   acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("failed to set group addr table: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set group addr table: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -423,8 +430,8 @@ int wl1251_acx_service_period_timeout(struct wl1251 *wl)
 	ret = wl1251_cmd_configure(wl, ACX_SERVICE_PERIOD_TIMEOUT,
 				   rx_timeout, sizeof(*rx_timeout));
 	if (ret < 0) {
-		wl1251_warning("failed to set service period timeout: %d",
-			       ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set service period timeout: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -448,7 +455,8 @@ int wl1251_acx_rts_threshold(struct wl1251 *wl, u16 rts_threshold)
 
 	ret = wl1251_cmd_configure(wl, DOT11_RTS_THRESHOLD, rts, sizeof(*rts));
 	if (ret < 0) {
-		wl1251_warning("failed to set rts threshold: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set rts threshold: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -474,7 +482,8 @@ int wl1251_acx_beacon_filter_opt(struct wl1251 *wl, bool enable_filter)
 	ret = wl1251_cmd_configure(wl, ACX_BEACON_FILTER_OPT,
 				   beacon_filter, sizeof(*beacon_filter));
 	if (ret < 0) {
-		wl1251_warning("failed to set beacon filter opt: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set beacon filter opt: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -503,7 +512,8 @@ int wl1251_acx_beacon_filter_table(struct wl1251 *wl)
 	ret = wl1251_cmd_configure(wl, ACX_BEACON_FILTER_TABLE,
 				   ie_table, sizeof(*ie_table));
 	if (ret < 0) {
-		wl1251_warning("failed to set beacon filter table: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set beacon filter table: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -529,8 +539,8 @@ int wl1251_acx_conn_monit_params(struct wl1251 *wl)
 	ret = wl1251_cmd_configure(wl, ACX_CONN_MONIT_PARAMS,
 				   acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("failed to set connection monitor "
-			       "parameters: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set connection monitor parameters: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -554,7 +564,8 @@ int wl1251_acx_sg_enable(struct wl1251 *wl)
 
 	ret = wl1251_cmd_configure(wl, ACX_SG_ENABLE, pta, sizeof(*pta));
 	if (ret < 0) {
-		wl1251_warning("failed to set softgemini enable: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set softgemini enable: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -606,7 +617,7 @@ int wl1251_acx_sg_cfg(struct wl1251 *wl)
 
 	ret = wl1251_cmd_configure(wl, ACX_SG_CFG, param, sizeof(*param));
 	if (ret < 0) {
-		wl1251_warning("failed to set sg config: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set sg config: %d\n", ret);
 		goto out;
 	}
 

@@ -632,7 +643,8 @@ int wl1251_acx_cca_threshold(struct wl1251 *wl)
 	ret = wl1251_cmd_configure(wl, ACX_CCA_THRESHOLD,
 				   detection, sizeof(*detection));
 	if (ret < 0)
-		wl1251_warning("failed to set cca threshold: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set cca threshold: %d\n",
+			   ret);
 
 	kfree(detection);
 	return ret;

@@ -656,7 +668,7 @@ int wl1251_acx_bcn_dtim_options(struct wl1251 *wl)
 
 	ret = wl1251_cmd_configure(wl, ACX_BCN_DTIM_OPTIONS, bb, sizeof(*bb));
 	if (ret < 0) {
-		wl1251_warning("failed to set rx config: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set rx config: %d\n", ret);
 		goto out;
 	}
 

@@ -680,7 +692,7 @@ int wl1251_acx_aid(struct wl1251 *wl, u16 aid)
 
 	ret = wl1251_cmd_configure(wl, ACX_AID, acx_aid, sizeof(*acx_aid));
 	if (ret < 0) {
-		wl1251_warning("failed to set aid: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set aid: %d\n", ret);
 		goto out;
 	}
 

@@ -708,7 +720,8 @@ int wl1251_acx_event_mbox_mask(struct wl1251 *wl, u32 event_mask)
 	ret = wl1251_cmd_configure(wl, ACX_EVENT_MBOX_MASK,
 				   mask, sizeof(*mask));
 	if (ret < 0) {
-		wl1251_warning("failed to set acx_event_mbox_mask: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set acx_event_mbox_mask: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -736,7 +749,8 @@ int wl1251_acx_low_rssi(struct wl1251 *wl, s8 threshold, u8 weight,
 
 	ret = wl1251_cmd_configure(wl, ACX_LOW_RSSI, rssi, sizeof(*rssi));
 	if (ret < 0)
-		wl1251_warning("failed to set low rssi threshold: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set low rssi threshold: %d\n",
+			   ret);
 
 	kfree(rssi);
 	return ret;

@@ -757,7 +771,8 @@ int wl1251_acx_set_preamble(struct wl1251 *wl, enum acx_preamble_type preamble)
 
 	ret = wl1251_cmd_configure(wl, ACX_PREAMBLE_TYPE, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("Setting of preamble failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "Setting of preamble failed: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -782,7 +797,8 @@ int wl1251_acx_cts_protect(struct wl1251 *wl,
 
 	ret = wl1251_cmd_configure(wl, ACX_CTS_PROTECTION, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("Setting of ctsprotect failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "Setting of ctsprotect failed: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -803,7 +819,7 @@ int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime)
 	ret = wl1251_cmd_interrogate(wl, ACX_TSF_INFO,
 				     tsf_info, sizeof(*tsf_info));
 	if (ret < 0) {
-		wl1251_warning("ACX_FW_REV interrogate failed");
+		wiphy_warn(wl->hw->wiphy, "ACX_FW_REV interrogate failed\n");
 		goto out;
 	}
 

@@ -824,7 +840,7 @@ int wl1251_acx_statistics(struct wl1251 *wl, struct acx_statistics *stats)
 	ret = wl1251_cmd_interrogate(wl, ACX_STATISTICS, stats,
 				     sizeof(*stats));
 	if (ret < 0) {
-		wl1251_warning("acx statistics failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "acx statistics failed: %d\n", ret);
 		return -ENOMEM;
 	}
 

@@ -857,7 +873,8 @@ int wl1251_acx_rate_policies(struct wl1251 *wl)
 
 	ret = wl1251_cmd_configure(wl, ACX_RATE_POLICY, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("Setting of rate policies failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "Setting of rate policies failed: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -902,7 +919,8 @@ int wl1251_acx_mem_cfg(struct wl1251 *wl)
 	ret = wl1251_cmd_configure(wl, ACX_MEM_CFG, mem_conf,
 				   sizeof(*mem_conf));
 	if (ret < 0) {
-		wl1251_warning("wl1251 mem config failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "wl1251 mem config failed: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -928,7 +946,8 @@ int wl1251_acx_wr_tbtt_and_dtim(struct wl1251 *wl, u16 tbtt, u8 dtim)
 	ret = wl1251_cmd_configure(wl, ACX_WR_TBTT_AND_DTIM,
 				   acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("failed to set tbtt and dtim: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set tbtt and dtim: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -954,7 +973,8 @@ int wl1251_acx_bet_enable(struct wl1251 *wl, enum wl1251_acx_bet_mode mode,
 
 	ret = wl1251_cmd_configure(wl, ACX_BET_ENABLE, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("wl1251 acx bet enable failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "wl1251 acx bet enable failed: %d\n",
+			   ret);
 		goto out;
 	}
 

@@ -983,7 +1003,8 @@ int wl1251_acx_arp_ip_filter(struct wl1251 *wl, bool enable, __be32 address)
 	ret = wl1251_cmd_configure(wl, ACX_ARP_IP_FILTER,
 				   acx, sizeof(*acx));
 	if (ret < 0)
-		wl1251_warning("failed to set arp ip filter: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "failed to set arp ip filter: %d\n",
+			   ret);
 
 	kfree(acx);
 	return ret;

@@ -1010,7 +1031,7 @@ int wl1251_acx_ac_cfg(struct wl1251 *wl, u8 ac, u8 cw_min, u16 cw_max,
 
 	ret = wl1251_cmd_configure(wl, ACX_AC_CFG, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("acx ac cfg failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "acx ac cfg failed: %d\n", ret);
 		goto out;
 	}
 

@@ -1043,7 +1064,7 @@ int wl1251_acx_tid_cfg(struct wl1251 *wl, u8 queue,
 
 	ret = wl1251_cmd_configure(wl, ACX_TID_CFG, acx, sizeof(*acx));
 	if (ret < 0) {
-		wl1251_warning("acx tid cfg failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "acx tid cfg failed: %d\n", ret);
 		goto out;
 	}
 

index a2a306e..f956c63 100644
@@ -74,7 +74,7 @@ int wl1251_cmd_test(struct wl1251 *wl, void *buf, size_t buf_len, u8 answer)
 	ret = wl1251_cmd_send(wl, CMD_TEST, buf, buf_len);
 
 	if (ret < 0) {
-		wl1251_warning("TEST command failed");
+		wiphy_warn(wl->hw->wiphy, "TEST command failed\n");
 		return ret;
 	}
 

@@ -158,7 +158,7 @@ int wl1251_cmd_configure(struct wl1251 *wl, u16 id, void *buf, size_t len)
 
 	ret = wl1251_cmd_send(wl, CMD_CONFIGURE, acx, len);
 	if (ret < 0) {
-		wl1251_warning("CONFIGURE command NOK");
+		wiphy_warn(wl->hw->wiphy, "CONFIGURE command NOK\n");
 		return ret;
 	}
 

@@ -182,8 +182,8 @@ int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,
 	/* Count and period will be filled by the target */
 	vbm->tim.bitmap_ctrl = bitmap_control;
 	if (bitmap_len > PARTIAL_VBM_MAX) {
-		wl1251_warning("cmd vbm len is %d B, truncating to %d",
-			       bitmap_len, PARTIAL_VBM_MAX);
+		wiphy_warn(wl->hw->wiphy, "cmd vbm len is %d B, truncating to %d\n",
+			   bitmap_len, PARTIAL_VBM_MAX);
 		bitmap_len = PARTIAL_VBM_MAX;
 	}
 	memcpy(vbm->tim.pvb_field, bitmap, bitmap_len);

@@ -413,7 +413,7 @@ int wl1251_cmd_template_set(struct wl1251 *wl, u16 cmd_id,
 
 	ret = wl1251_cmd_send(wl, cmd_id, cmd, cmd_len);
 	if (ret < 0) {
-		wl1251_warning("cmd set_template failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "cmd set_template failed: %d\n", ret);
 		goto out;
 	}
 

index b1fedb9..796ccf4 100644
@@ -35,13 +35,13 @@ int wl1251_hw_init_hwenc_config(struct wl1251 *wl)
 
 	ret = wl1251_acx_feature_cfg(wl, 0);
 	if (ret < 0) {
-		wl1251_warning("couldn't set feature config");
+		wiphy_warn(wl->hw->wiphy, "couldn't set feature config\n");
 		return ret;
 	}
 
 	ret = wl1251_acx_default_key(wl, wl->default_key);
 	if (ret < 0) {
-		wl1251_warning("couldn't set default key");
+		wiphy_warn(wl->hw->wiphy, "couldn't set default key\n");
 		return ret;
 	}
 

index 7266d66..a0576e7 100644
@@ -150,7 +150,7 @@ static void wl1251_fw_wakeup(struct wl1251 *wl)
 	elp_reg = wl1251_read_elp(wl, HW_ACCESS_ELP_CTRL_REG_ADDR);
 
 	if (!(elp_reg & ELPCTRL_WLAN_READY))
-		wl1251_warning("WLAN not ready");
+		wiphy_warn(wl->hw->wiphy, "WLAN not ready\n");
 }
 
 static int wl1251_chip_wakeup(struct wl1251 *wl)

@@ -264,9 +264,9 @@ static void wl1251_irq_work(struct work_struct *work)
 				intr |= WL1251_ACX_INTR_RX1_DATA;
 				break;
 			default:
-				wl1251_warning(
-					"RX: FW and host out of sync: %d",
-					wl->rx_counter - wl->rx_handled);
+				wiphy_warn(wl->hw->wiphy,
+					   "RX: FW and host out of sync: %d\n",
+					   wl->rx_counter - wl->rx_handled);
 				break;
 			}
 

@@ -352,7 +352,7 @@ static int wl1251_join(struct wl1251 *wl, u8 bss_type, u8 channel,
 
 	ret = wl1251_event_wait(wl, JOIN_EVENT_COMPLETE_ID, 100);
 	if (ret < 0)
-		wl1251_warning("join timeout");
+		wiphy_warn(wl->hw->wiphy, "join timeout\n");
 
 out:
 	return ret;

@@ -577,7 +577,8 @@ static int wl1251_build_null_data(struct wl1251 *wl)
 out:
 	dev_kfree_skb(skb);
 	if (ret)
-		wl1251_warning("cmd buld null data failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "cmd buld null data failed: %d\n",
+			   ret);
 
 	return ret;
 }

@@ -973,7 +974,7 @@ static int wl1251_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
 	ret = wl1251_cmd_send(wl, CMD_SET_KEYS, wl_cmd, sizeof(*wl_cmd));
 	if (ret < 0) {
-		wl1251_warning("could not set keys");
+		wiphy_warn(wl->hw->wiphy, "could not set keys\n");
 		goto out_sleep;
 	}
 

@@ -1084,7 +1085,8 @@ static int wl1251_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 
 	ret = wl1251_acx_rts_threshold(wl, (u16) value);
 	if (ret < 0)
-		wl1251_warning("wl1251_op_set_rts_threshold failed: %d", ret);
+		wiphy_warn(wl->hw->wiphy, "wl1251_op_set_rts_threshold failed: %d\n",
+			   ret);
 
 	wl1251_ps_elp_sleep(wl);
 

@@ -1172,7 +1174,8 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 		else
 			ret = wl1251_acx_slot(wl, SLOT_TIME_LONG);
 		if (ret < 0) {
-			wl1251_warning("Set slot time failed %d", ret);
+			wiphy_warn(wl->hw->wiphy, "Set slot time failed %d\n",
+				   ret);
 			goto out_sleep;
 		}
 	}

@@ -1190,7 +1193,8 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 		else
 			ret = wl1251_acx_cts_protect(wl, CTSPROTECT_DISABLE);
 		if (ret < 0) {
-			wl1251_warning("Set ctsprotect failed %d", ret);
+			wiphy_warn(wl->hw->wiphy, "Set ctsprotect failed %d\n",
+				   ret);
 			goto out_sleep;
 		}
 	}

@@ -1436,7 +1440,7 @@ static int wl1251_read_eeprom_mac(struct wl1251 *wl)
 
 	ret = wl1251_read_eeprom(wl, 0x1c, mac, sizeof(mac));
 	if (ret < 0) {
-		wl1251_warning("failed to read MAC address from EEPROM");
+		wiphy_warn(wl->hw->wiphy, "failed to read MAC address from EEPROM\n");
 		return ret;
 	}
 

index 0176656..df59521 100644
@@ -158,8 +158,8 @@ static void wl1251_rx_body(struct wl1251 *wl,
 	last_id_inc = (wl->rx_last_id + 1) % (RX_MAX_PACKET_ID + 1);
 
 	if (last_id_inc != curr_id) {
-		wl1251_warning("curr ID:%d, last ID inc:%d",
-			       curr_id, last_id_inc);
+		wiphy_warn(wl->hw->wiphy, "curr ID:%d, last ID inc:%d\n",
+			   curr_id, last_id_inc);
 		wl->rx_last_id = curr_id;
 	} else {
 		wl->rx_last_id = last_id_inc;

index 0aa2d54..0e782f8 100644
@@ -289,13 +289,13 @@ static void enable_tx_for_packet_injection(struct wl1251 *wl)
 	ret = wl1251_cmd_join(wl, BSS_TYPE_STA_BSS, wl->channel,
 			      wl->beacon_int, wl->dtim_period);
 	if (ret < 0) {
-		wl1251_warning("join failed");
+		wiphy_warn(wl->hw->wiphy, "join failed\n");
 		return;
 	}
 
 	ret = wl1251_event_wait(wl, JOIN_EVENT_COMPLETE_ID, 100);
 	if (ret < 0) {
-		wl1251_warning("join timeout");
+		wiphy_warn(wl->hw->wiphy, "join timeout\n");
 		return;
 	}
 

index 2fdb194..5d520d2 100644
@@ -54,9 +54,6 @@ enum {
 
 #define DEBUG_DUMP_LIMIT 1024
 
-#define wl1251_warning(fmt, arg...) \
-	printk(KERN_WARNING DRIVER_PREFIX "WARNING " fmt "\n", ##arg)

index a0576e7..593bed9 100644
@@ -1469,7 +1469,7 @@ static int wl1251_register_hw(struct wl1251 *wl)
 
 	wl->mac80211_registered = true;
 
-	wl1251_notice("loaded");
+	wiphy_info(wl->hw->wiphy, "loaded\n");
 
 	return 0;
 }

@@ -1503,7 +1503,7 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
 		goto out;
 
 	wl1251_debugfs_init(wl);
-	wl1251_notice("initialized");
+	wiphy_info(wl->hw->wiphy, "initialized\n");
 
 	ret = 0;
 

index f48e985..cc52a97 100644
@@ -382,7 +382,7 @@ static int __init wl1251_sdio_init(void)
 static void __exit wl1251_sdio_exit(void)
 {
 	sdio_unregister_driver(&wl1251_sdio_driver);
-	wl1251_notice("unloaded");
+	pr_info("unloaded\n");
 }
 
 module_init(wl1251_sdio_init);

index 5d520d2..62a40cc 100644
@@ -54,9 +54,6 @@ enum {
 
 #define DEBUG_DUMP_LIMIT 1024
 
-#define wl1251_notice(fmt, arg...) \
-	printk(KERN_INFO DRIVER_PREFIX fmt "\n", ##arg)
-
 #define wl1251_info(fmt, arg...) \
 	printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg)
 

index 796ccf4..29a990d 100644
@@ -411,11 +411,11 @@ int wl1251_hw_init(struct wl1251 *wl)
 		goto out_free_data_path;
 
 	wl_mem_map = wl->target_mem_map;
-	wl1251_info("%d tx blocks at 0x%x, %d rx blocks at 0x%x",
-		    wl_mem_map->num_tx_mem_blocks,
-		    wl->data_path->tx_control_addr,
-		    wl_mem_map->num_rx_mem_blocks,
-		    wl->data_path->rx_control_addr);
+	wl1251_debug(DEBUG_ALWAYS, "%d tx blocks at 0x%x, %d rx blocks at 0x%x",
+		     wl_mem_map->num_tx_mem_blocks,
+		     wl->data_path->tx_control_addr,
+		     wl_mem_map->num_rx_mem_blocks,
+		     wl->data_path->rx_control_addr);
 
 	return 0;
 

index 593bed9..32b8c98 100644
@@ -423,7 +423,7 @@ static int wl1251_op_start(struct ieee80211_hw *hw)
 
 	wl->state = WL1251_STATE_ON;
 
-	wl1251_info("firmware booted (%s)", wl->fw_ver);
+	wl1251_debug(DEBUG_ALWAYS, "firmware booted (%s)", wl->fw_ver);
 
 	/* update hw/fw version info in wiphy struct */
 	wiphy->hw_version = wl->chip_id;

@@ -442,7 +442,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
 {
 	struct wl1251 *wl = hw->priv;
 
-	wl1251_info("down");
+	wl1251_debug(DEBUG_ALWAYS, "down");
 
 	wl1251_debug(DEBUG_MAC80211, "mac80211 stop");
 

index cc52a97..d2fb7d1 100644
@@ -290,12 +290,12 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 		wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
 		wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
 
-		wl1251_info("using dedicated interrupt line");
+		wl1251_debug(DEBUG_ALWAYS, "using dedicated interrupt line");
 	} else {
 		wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
 		wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
 
-		wl1251_info("using SDIO interrupt");
+		wl1251_debug(DEBUG_ALWAYS, "using SDIO interrupt");
 	}
 
 	ret = wl1251_init_ieee80211(wl);

index 62a40cc..705573f 100644
@@ -47,6 +47,7 @@ enum {
 	DEBUG_MAC80211	= BIT(11),
 	DEBUG_CMD	= BIT(12),
 	DEBUG_ACX	= BIT(13),
+	DEBUG_ALWAYS	= BIT(31),
 	DEBUG_ALL	= ~0,
 };
 

@@ -54,12 +55,9 @@ enum {
 
 #define DEBUG_DUMP_LIMIT 1024
 
-#define wl1251_info(fmt, arg...) \
-	printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg)
-
 #define wl1251_debug(level, fmt, arg...) \
 	do { \
-		if (level & DEBUG_LEVEL) \
+		if (level == DEBUG_ALWAYS || (level & DEBUG_LEVEL))	\
 			printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg); \
 	} while (0)