net: wireless: redpine: rename exported functions

We need to rename the exported rsi_ functions so they don't conflict
with the mainline driver.
Signed-off-by: default avatarAngus Ainslie (Purism) <angus@akkea.ca>
parent e726b075
......@@ -60,10 +60,10 @@ static void rsi_coex_sched_tx_pkts(struct rsi_coex_ctrl_block *coex_cb)
#endif
while (1) {
coex_q = rsi_coex_determine_coex_q(coex_cb);
rsi_dbg(INFO_ZONE, "queue = %d\n", coex_q);
redpine_dbg(INFO_ZONE, "queue = %d\n", coex_q);
if (coex_q == INVALID_QUEUE) {
rsi_dbg(DATA_TX_ZONE, "No more pkt\n");
redpine_dbg(DATA_TX_ZONE, "No more pkt\n");
break;
}
......@@ -71,11 +71,11 @@ static void rsi_coex_sched_tx_pkts(struct rsi_coex_ctrl_block *coex_cb)
skb = skb_dequeue(&coex_cb->coex_tx_qs[BT_Q]);
#ifdef CONFIG_REDPINE_ZIGB
if (common->zb_fsm_state == ZB_DEVICE_READY) {
rsi_dbg(DATA_TX_ZONE, "Sending zigbee pkt\n");
redpine_dbg(DATA_TX_ZONE, "Sending zigbee pkt\n");
rsi_send_zb_pkt(coex_cb->priv, skb);
} else {
#endif
rsi_dbg(DATA_TX_ZONE, "Sending BT pkt\n");
redpine_dbg(DATA_TX_ZONE, "Sending BT pkt\n");
rsi_send_bt_pkt(coex_cb->priv, skb);
#ifdef CONFIG_REDPINE_ZIGB
}
......@@ -117,10 +117,10 @@ int rsi_coex_recv_pkt(struct rsi_common *common, u8 *msg)
if (msg_type == COMMON_CARD_READY_IND) {
common->hibernate_resume = false;
rsi_dbg(INFO_ZONE, "COMMON CARD READY RECEIVED\n");
redpine_dbg(INFO_ZONE, "COMMON CARD READY RECEIVED\n");
rsi_handle_card_ready(common, msg);
} else if (msg_type == SLEEP_NOTIFY_IND) {
rsi_dbg(INFO_ZONE, "\n\n sleep notify RECEIVED\n");
redpine_dbg(INFO_ZONE, "\n\n sleep notify RECEIVED\n");
rsi_mgmt_pkt_recv(common, msg);
}
......@@ -184,7 +184,7 @@ int rsi_coex_init(struct rsi_common *common)
&coex_cb->coex_tx_thread,
rsi_coex_scheduler_thread,
"Coex-Tx-Thread")) {
rsi_dbg(ERR_ZONE, "%s: Unable to init tx thrd\n", __func__);
redpine_dbg(ERR_ZONE, "%s: Unable to init tx thrd\n", __func__);
goto err;
}
return 0;
......
......@@ -166,7 +166,7 @@ static u8 rsi_core_determine_hal_queue(struct rsi_common *common)
}
if (common->hw_data_qs_blocked) {
rsi_dbg(INFO_ZONE, "%s: data queue blocked\n", __func__);
redpine_dbg(INFO_ZONE, "%s: data queue blocked\n", __func__);
return q_num;
}
......@@ -237,7 +237,7 @@ static void rsi_core_queue_pkt(struct rsi_common *common,
u8 q_num = skb->priority;
if (q_num >= NUM_SOFT_QUEUES) {
rsi_dbg(ERR_ZONE, "%s: Invalid Queue Number: q_num = %d\n",
redpine_dbg(ERR_ZONE, "%s: Invalid Queue Number: q_num = %d\n",
__func__, q_num);
dev_kfree_skb(skb);
return;
......@@ -258,7 +258,7 @@ static struct sk_buff *rsi_core_dequeue_pkt(struct rsi_common *common,
u8 q_num)
{
if (q_num >= NUM_SOFT_QUEUES) {
rsi_dbg(ERR_ZONE, "%s: Invalid Queue Number: q_num = %d\n",
redpine_dbg(ERR_ZONE, "%s: Invalid Queue Number: q_num = %d\n",
__func__, q_num);
return NULL;
}
......@@ -286,7 +286,7 @@ void rsi_core_qos_processor(struct rsi_common *common)
tstamp_1 = jiffies;
while (1) {
q_num = rsi_core_determine_hal_queue(common);
rsi_dbg(DATA_TX_ZONE,
redpine_dbg(DATA_TX_ZONE,
"%s: Queue number = %d\n", __func__, q_num);
if (q_num == INVALID_QUEUE)
......@@ -322,14 +322,14 @@ void rsi_core_qos_processor(struct rsi_common *common)
skb = rsi_core_dequeue_pkt(common, q_num);
if (!skb) {
rsi_dbg(ERR_ZONE, "skb null\n");
redpine_dbg(ERR_ZONE, "skb null\n");
mutex_unlock(&common->tx_lock);
break;
}
if ((adapter->peer_notify) &&
(skb->data[2] == PEER_NOTIFY)) {
adapter->peer_notify = false;
rsi_dbg(INFO_ZONE, "%s RESET PEER_NOTIFY\n", __func__);
redpine_dbg(INFO_ZONE, "%s RESET PEER_NOTIFY\n", __func__);
}
if (!IS_ALIGNED((unsigned long)skb->data, RSI_DMA_ALIGN))
......@@ -441,20 +441,20 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb)
u8 q_num, tid = 0;
if ((!skb) || (!skb->len)) {
rsi_dbg(ERR_ZONE, "%s: Null skb/zero Length packet\n",
redpine_dbg(ERR_ZONE, "%s: Null skb/zero Length packet\n",
__func__);
goto xmit_fail;
}
#ifdef CONFIG_REDPINE_WOW
if (common->wow_flags & RSI_WOW_ENABLED) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"%s: Blocking Tx_packets when WOWLAN is enabled\n",
__func__);
goto xmit_fail;
}
#endif
if (common->fsm_state != FSM_MAC_INIT_DONE) {
rsi_dbg(ERR_ZONE, "%s: FSM state not open\n", __func__);
redpine_dbg(ERR_ZONE, "%s: FSM state not open\n", __func__);
goto xmit_fail;
}
......@@ -484,13 +484,13 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb)
#ifdef CONFIG_REDPINE_WOW
if ((ieee80211_is_deauth(wlh->frame_control)) &&
(common->wow_flags & RSI_WOW_ENABLED)) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"%s: Discarding Deauth when WOWLAN is enabled\n",
__func__);
goto xmit_fail;
}
#endif
rsi_dbg(MGMT_TX_ZONE, "Core: TX Dot11 Mgmt Pkt Type: %s\n",
redpine_dbg(MGMT_TX_ZONE, "Core: TX Dot11 Mgmt Pkt Type: %s\n",
dot11_pkt_type(wlh->frame_control));
#ifndef CONFIG_REDPINE_HW_SCAN_OFFLOAD
if (ieee80211_is_probe_req(wlh->frame_control)) {
......@@ -504,13 +504,13 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb)
}
#endif
if (rsi_prepare_mgmt_desc(common, skb)) {
rsi_dbg(ERR_ZONE, "Failed to prepeare desc\n");
redpine_dbg(ERR_ZONE, "Failed to prepeare desc\n");
goto xmit_fail;
}
} else {
struct rsi_sta *sta = NULL;
rsi_dbg(INFO_ZONE, "Core: TX Data Packet\n");
redpine_dbg(INFO_ZONE, "Core: TX Data Packet\n");
rsi_hex_dump(DATA_TX_ZONE, "TX Data Packet",
skb->data, skb->len);
......@@ -592,7 +592,7 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb)
skb->priority = q_num;
}
if (rsi_prepare_data_desc(common, skb)) {
rsi_dbg(ERR_ZONE, "Failed to prepare data desc\n");
redpine_dbg(ERR_ZONE, "Failed to prepare data desc\n");
goto xmit_fail;
}
}
......@@ -616,7 +616,7 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb)
}
if ((skb_queue_len(&common->tx_queue[q_num]) + 1) >=
water_mark) {
rsi_dbg(ERR_ZONE, "%s: queue %d is full\n",
redpine_dbg(ERR_ZONE, "%s: queue %d is full\n",
__func__, q_num);
if (!ieee80211_queue_stopped(adapter->hw, WME_AC(q_num)))
ieee80211_stop_queue(adapter->hw, WME_AC(q_num));
......@@ -626,13 +626,13 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb)
}
rsi_core_queue_pkt(common, skb);
rsi_dbg(DATA_TX_ZONE, "%s: ===> Scheduling TX thead <===\n", __func__);
redpine_dbg(DATA_TX_ZONE, "%s: ===> Scheduling TX thead <===\n", __func__);
rsi_set_event(&common->tx_thread.event);
return;
xmit_fail:
rsi_dbg(ERR_ZONE, "%s: Failed to queue packet\n", __func__);
redpine_dbg(ERR_ZONE, "%s: Failed to queue packet\n", __func__);
/* Dropping pkt here */
ieee80211_free_txskb(common->priv->hw, skb);
......
......@@ -216,7 +216,7 @@ static int rsi_stats_open(struct inode *inode,
*/
static int rsi_debug_zone_read(struct seq_file *seq, void *data)
{
rsi_dbg(FSM_ZONE, "%x: rsi_enabled zone", rsi_zone_enabled);
redpine_dbg(FSM_ZONE, "%x: rsi_enabled zone", rsi_zone_enabled);
seq_printf(seq, "The zones available are %#x\n",
rsi_zone_enabled);
return 0;
......@@ -281,11 +281,11 @@ static int rsi_bgscan_int_read(struct seq_file *file, void *data)
int cnt;
if (!common) {
rsi_dbg(ERR_ZONE, "No Interface\n");
redpine_dbg(ERR_ZONE, "No Interface\n");
return -ENODEV;
}
if (common->iface_down) {
rsi_dbg(ERR_ZONE, "Interface Down\n");
redpine_dbg(ERR_ZONE, "Interface Down\n");
return -ENODEV;
}
params = &common->bgscan_info;
......@@ -343,11 +343,11 @@ static ssize_t rsi_bgscan_write(struct file *file,
int ret;
if (!common) {
rsi_dbg(ERR_ZONE, "No Interface\n");
redpine_dbg(ERR_ZONE, "No Interface\n");
return -ENODEV;
}
if (common->iface_down) {
rsi_dbg(ERR_ZONE, "Interface Down\n");
redpine_dbg(ERR_ZONE, "Interface Down\n");
return -ENODEV;
}
adapter = common->priv;
......@@ -371,7 +371,7 @@ static ssize_t rsi_bgscan_write(struct file *file,
/* return here if bgscan is already disabled */
if (!common->bgscan_en) {
#ifdef PLATFORM_X86
rsi_dbg(ERR_ZONE, "bgscan already disabled\n");
redpine_dbg(ERR_ZONE, "bgscan already disabled\n");
#endif
return total_bytes;
}
......@@ -379,7 +379,7 @@ static ssize_t rsi_bgscan_write(struct file *file,
mutex_lock(&common->mutex);
if (bss->assoc && !rsi_send_bgscan_params(common, 0)) {
#ifdef PLATFORM_X86
rsi_dbg(ERR_ZONE, "*** bgscan disabled ***\n");
redpine_dbg(ERR_ZONE, "*** bgscan disabled ***\n");
#endif
common->bgscan_en = 0;
}
......@@ -422,17 +422,17 @@ static ssize_t rsi_bgscan_write(struct file *file,
common->bgscan_info.user_channels[cnt] = bgscan_vals[7 + cnt];
#ifdef PLATFORM_X86
rsi_dbg(INFO_ZONE,
redpine_dbg(INFO_ZONE,
"bgscan_count = %d, roam_count = %d, periodicity = %d\n",
common->bgscan_info.bgscan_threshold,
common->bgscan_info.roam_threshold,
common->bgscan_info.bgscan_periodicity);
rsi_dbg(INFO_ZONE,
redpine_dbg(INFO_ZONE,
"active_scan_dur = %d, passive_scan_dur = %d, two_probe = %d\n",
common->bgscan_info.active_scan_duration,
common->bgscan_info.passive_scan_duration,
common->bgscan_info.two_probe);
rsi_dbg(INFO_ZONE, "Number of scan channels = %d\n",
redpine_dbg(INFO_ZONE, "Number of scan channels = %d\n",
common->bgscan_info.num_user_channels);
rsi_hex_dump(INFO_ZONE, "bgscan channels",
(u8 *)common->bgscan_info.user_channels,
......@@ -442,7 +442,7 @@ static ssize_t rsi_bgscan_write(struct file *file,
/* If connection is not done don't send bgscan params */
if (!bss->assoc) {
#ifdef PLATFORM_X86
rsi_dbg(INFO_ZONE, "Station not connected; skip now\n");
redpine_dbg(INFO_ZONE, "Station not connected; skip now\n");
#endif
return total_bytes;
}
......@@ -480,7 +480,7 @@ static ssize_t rsi_write_chload_meas_req(struct file *file,
&adapter->vifs[adapter->sc_nvifs - 1]->bss_conf;
if (!bss->assoc) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"unable to send channelload in non connected state\n");
return -EINVAL;
}
......@@ -510,9 +510,9 @@ static ssize_t rsi_write_chload_meas_req(struct file *file,
common->rrm_chload_params.meas_type = chan_load_vals[11];
if (!rsi_rrm_send_channel_load_req(common))
rsi_dbg(ERR_ZONE, "Sent channel load measurement request\n");
redpine_dbg(ERR_ZONE, "Sent channel load measurement request\n");
else
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"Failed sending channel load measurement req\n");
return total_bytes;
......@@ -553,7 +553,7 @@ static ssize_t rsi_write_frame_meas_req(struct file *file,
&adapter->vifs[adapter->sc_nvifs - 1]->bss_conf;
if (!bss->assoc) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"unable to send frame req in non connected state\n");
return -EINVAL;
}
......@@ -590,9 +590,9 @@ static ssize_t rsi_write_frame_meas_req(struct file *file,
common->rrm_frame_params.macid[i] = frame_load_vals[13 + i];
if (!rsi_rrm_send_frame_req(common))
rsi_dbg(ERR_ZONE, "Sent frame measurement request\n");
redpine_dbg(ERR_ZONE, "Sent frame measurement request\n");
else
rsi_dbg(ERR_ZONE, "Failed sending frame measurement req\n");
redpine_dbg(ERR_ZONE, "Failed sending frame measurement req\n");
return total_bytes;
}
......@@ -638,7 +638,7 @@ static ssize_t rsi_write_beacon_meas_req(struct file *file,
&adapter->vifs[adapter->sc_nvifs - 1]->bss_conf;
if (!bss->assoc) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"unable to send beacon req in non connected state\n");
return -EINVAL;
}
......@@ -684,27 +684,27 @@ static ssize_t rsi_write_beacon_meas_req(struct file *file,
memset(common->rrm_beacon_params.str, 0, 32);
memcpy(common->rrm_beacon_params.str, str, strlen(str));
rsi_dbg(INFO_ZONE, "regulatory class %d\n",
redpine_dbg(INFO_ZONE, "regulatory class %d\n",
common->rrm_beacon_params.regulatory_class);
rsi_dbg(INFO_ZONE, "channel num %d\n",
redpine_dbg(INFO_ZONE, "channel num %d\n",
common->rrm_beacon_params.channel_num);
rsi_dbg(INFO_ZONE, "rand_interval %d\n",
redpine_dbg(INFO_ZONE, "rand_interval %d\n",
common->rrm_beacon_params.rand_interval);
rsi_dbg(INFO_ZONE, "meas_duration %d\n",
redpine_dbg(INFO_ZONE, "meas_duration %d\n",
common->rrm_beacon_params.meas_duration);
rsi_dbg(INFO_ZONE, "meas_req_mode %d\n",
redpine_dbg(INFO_ZONE, "meas_req_mode %d\n",
common->rrm_beacon_params.meas_req_mode);
rsi_dbg(INFO_ZONE, "meas_type %d\n",
redpine_dbg(INFO_ZONE, "meas_type %d\n",
common->rrm_beacon_params.meas_type);
rsi_dbg(INFO_ZONE, "meas_mode %d\n",
redpine_dbg(INFO_ZONE, "meas_mode %d\n",
common->rrm_beacon_params.meas_mode);
rsi_dbg(INFO_ZONE, "ssid %s\n",
redpine_dbg(INFO_ZONE, "ssid %s\n",
common->rrm_beacon_params.str);
if (!rsi_rrm_send_beacon_req(common))
rsi_dbg(ERR_ZONE, "Sent Beacon measurement request\n");
redpine_dbg(ERR_ZONE, "Sent Beacon measurement request\n");
else
rsi_dbg(ERR_ZONE, "Failed sending beacon measurement req\n");
redpine_dbg(ERR_ZONE, "Failed sending beacon measurement req\n");
return total_bytes;
}
......@@ -736,7 +736,7 @@ static int rsi_read_beacon_meas_req(struct inode *inode, struct file *file)
}
#endif
static const struct rsi_dbg_files dev_debugfs_files[] = {
static const struct redpine_dbg_files dev_debugfs_files[] = {
{"version", 0644, FOPS(rsi_version_open),},
{"stats", 0644, FOPS(rsi_stats_open),},
{"debug_zone", 0666, FOPS_RW(rsi_debug_read, rsi_debug_zone_write),},
......@@ -753,18 +753,18 @@ static const struct rsi_dbg_files dev_debugfs_files[] = {
};
/**
* rsi_init_dbgfs() - This function initializes the dbgfs entry.
* redpine_init_dbgfs() - This function initializes the dbgfs entry.
* @adapter: Pointer to the adapter structure.
*
* Return: 0 on success, -1 on failure.
*/
int rsi_init_dbgfs(struct rsi_hw *adapter)
int redpine_init_dbgfs(struct rsi_hw *adapter)
{
struct rsi_common *common = adapter->priv;
struct rsi_debugfs *dev_dbgfs;
char devdir[6];
int ii;
const struct rsi_dbg_files *files;
const struct redpine_dbg_files *files;
dev_dbgfs = kzalloc(sizeof(*dev_dbgfs), GFP_KERNEL);
if (!dev_dbgfs)
......@@ -793,16 +793,16 @@ int rsi_init_dbgfs(struct rsi_hw *adapter)
}
return 0;
}
EXPORT_SYMBOL_GPL(rsi_init_dbgfs);
EXPORT_SYMBOL_GPL(redpine_init_dbgfs);
/**
* rsi_remove_dbgfs() - Removes the previously created dbgfs file entries
* redpine_remove_dbgfs() - Removes the previously created dbgfs file entries
* in the reverse order of creation.
* @adapter: Pointer to the adapter structure.
*
* Return: None.
*/
void rsi_remove_dbgfs(struct rsi_hw *adapter)
void redpine_remove_dbgfs(struct rsi_hw *adapter)
{
struct rsi_debugfs *dev_dbgfs = adapter->dfsentry;
......@@ -811,4 +811,4 @@ void rsi_remove_dbgfs(struct rsi_hw *adapter)
debugfs_remove_recursive(dev_dbgfs->subdir);
}
EXPORT_SYMBOL_GPL(rsi_remove_dbgfs);
EXPORT_SYMBOL_GPL(redpine_remove_dbgfs);
This diff is collapsed.
......@@ -42,10 +42,10 @@
*/
static int rsi_hci_open(struct hci_dev *hdev)
{
rsi_dbg(ERR_ZONE, "RSI HCI DEVICE \"%s\" open\n", hdev->name);
redpine_dbg(ERR_ZONE, "RSI HCI DEVICE \"%s\" open\n", hdev->name);
if (test_and_set_bit(HCI_RUNNING, &hdev->flags))
rsi_dbg(ERR_ZONE, "%s: device `%s' already running\n",
redpine_dbg(ERR_ZONE, "%s: device `%s' already running\n",
__func__, hdev->name);
return 0;
......@@ -60,10 +60,10 @@ static int rsi_hci_open(struct hci_dev *hdev)
*/
static int rsi_hci_close(struct hci_dev *hdev)
{
rsi_dbg(ERR_ZONE, "RSI HCI DEVICE \"%s\" closed\n", hdev->name);
redpine_dbg(ERR_ZONE, "RSI HCI DEVICE \"%s\" closed\n", hdev->name);
if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
rsi_dbg(ERR_ZONE, "%s: device `%s' not running\n",
redpine_dbg(ERR_ZONE, "%s: device `%s' not running\n",
__func__, hdev->name);
return 0;
......@@ -83,7 +83,7 @@ static int rsi_hci_flush(struct hci_dev *hdev)
if (!(h_adapter = hci_get_drvdata(hdev)))
return -EFAULT;
rsi_dbg(ERR_ZONE, "RSI `%s' flush\n", hdev->name);
redpine_dbg(ERR_ZONE, "RSI `%s' flush\n", hdev->name);
return 0;
}
......@@ -111,7 +111,7 @@ static int rsi_hci_send_pkt(struct hci_dev *hdev, struct sk_buff *skb)
int status = 0;
if (skb->len <= 0) {
rsi_dbg(ERR_ZONE, "Zero length packet\n");
redpine_dbg(ERR_ZONE, "Zero length packet\n");
//hdev->sta.err_tx++;
status = -EINVAL;
goto fail;
......@@ -126,14 +126,14 @@ static int rsi_hci_send_pkt(struct hci_dev *hdev, struct sk_buff *skb)
#ifdef CONFIG_REDPINE_WOW
/* Stop here when in suspend */
if (h_adapter->priv->wow_flags & RSI_WOW_ENABLED) {
rsi_dbg(INFO_ZONE, "In suspend: Dropping the pkt\n");
redpine_dbg(INFO_ZONE, "In suspend: Dropping the pkt\n");
status = -ENETDOWN;
goto fail;
}
#endif
if (h_adapter->priv->bt_fsm_state != BT_DEVICE_READY) {
rsi_dbg(ERR_ZONE, "BT Device not ready\n");
redpine_dbg(ERR_ZONE, "BT Device not ready\n");
status = -ENODEV;
goto fail;
}
......@@ -199,7 +199,7 @@ int rsi_send_rfmode_frame(struct rsi_common *common)
struct rsi_bt_rfmode_frame *cmd_frame;
int status;
rsi_dbg(MGMT_TX_ZONE, "%s: Sending BT RF mode frame\n", __func__);
redpine_dbg(MGMT_TX_ZONE, "%s: Sending BT RF mode frame\n", __func__);
skb = dev_alloc_skb(sizeof(struct rsi_bt_rfmode_frame));
if (!skb)
......@@ -230,7 +230,7 @@ int rsi_deregister_bt(struct rsi_common *common)
struct rsi_bt_cmd_frame *cmd_frame;
int status;
rsi_dbg(MGMT_TX_ZONE, "%s: Sending BT register frame\n", __func__);
redpine_dbg(MGMT_TX_ZONE, "%s: Sending BT register frame\n", __func__);
skb = dev_alloc_skb(sizeof(struct rsi_bt_cmd_frame));
if (!skb)
......@@ -265,23 +265,23 @@ int rsi_hci_recv_pkt(struct rsi_common *common, u8 *pkt)
if ((common->bt_fsm_state == BT_DEVICE_NOT_READY) &&
(pkt[14] == BT_CARD_READY_IND)) {
rsi_dbg(INIT_ZONE, "%s: ===> BT Card Ready Received <===\n",
redpine_dbg(INIT_ZONE, "%s: ===> BT Card Ready Received <===\n",
__func__);
if (common->suspend_in_prog) {
rsi_dbg(INFO_ZONE,
redpine_dbg(INFO_ZONE,
"Suspend is in prog; Do not process\n");
return 0;
}
if (rsi_send_bt_reg_params(common)) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"%s: Failed to write BT reg params\n",
__func__);
}
rsi_dbg(INFO_ZONE, "Attaching HCI module\n");
redpine_dbg(INFO_ZONE, "Attaching HCI module\n");
if (rsi_hci_attach(common)) {
rsi_dbg(ERR_ZONE, "Failed to attach HCI module\n");
redpine_dbg(ERR_ZONE, "Failed to attach HCI module\n");
return 0;
}
......@@ -289,7 +289,7 @@ int rsi_hci_recv_pkt(struct rsi_common *common, u8 *pkt)
}
if (common->bt_fsm_state != BT_DEVICE_READY) {
rsi_dbg(INFO_ZONE, "BT Device not ready\n");
redpine_dbg(INFO_ZONE, "BT Device not ready\n");
return 0;
}
if (queue_no == RSI_BT_MGMT_Q) {
......@@ -297,13 +297,13 @@ int rsi_hci_recv_pkt(struct rsi_common *common, u8 *pkt)
switch (msg_type) {
case RESULT_CONFIRM:
rsi_dbg(MGMT_RX_ZONE, "BT Result Confirm\n");
redpine_dbg(MGMT_RX_ZONE, "BT Result Confirm\n");
return 0;
case BT_BER:
rsi_dbg(MGMT_RX_ZONE, "BT Ber\n");
redpine_dbg(MGMT_RX_ZONE, "BT Ber\n");
return 0;
case BT_CW:
rsi_dbg(MGMT_RX_ZONE, "BT CW\n");
redpine_dbg(MGMT_RX_ZONE, "BT CW\n");
return 0;
default:
break;
......@@ -311,7 +311,7 @@ int rsi_hci_recv_pkt(struct rsi_common *common, u8 *pkt)
}
skb = dev_alloc_skb(pkt_len);
if (!skb) {
rsi_dbg(ERR_ZONE, "%s: Failed to alloc skb\n", __func__);
redpine_dbg(ERR_ZONE, "%s: Failed to alloc skb\n", __func__);
return -ENOMEM;
}
hdev = h_adapter->hdev;
......@@ -347,7 +347,7 @@ int rsi_hci_attach(struct rsi_common *common)
/* TODO: Check GFP_ATOMIC */
h_adapter = kzalloc(sizeof (*h_adapter), GFP_KERNEL);
if (!h_adapter) {
rsi_dbg (ERR_ZONE, "Failed to alloc HCI adapter\n");
redpine_dbg (ERR_ZONE, "Failed to alloc HCI adapter\n");
return -ENOMEM;
}
h_adapter->priv = common;
......@@ -355,7 +355,7 @@ int rsi_hci_attach(struct rsi_common *common)
/* Create HCI Interface */
hdev = hci_alloc_dev();
if (!hdev) {
rsi_dbg (ERR_ZONE, "Failed to alloc HCI device\n");
redpine_dbg (ERR_ZONE, "Failed to alloc HCI device\n");
goto err;
}
h_adapter->hdev = hdev;
......@@ -387,15 +387,15 @@ int rsi_hci_attach(struct rsi_common *common)
status = hci_register_dev(hdev);
if (status < 0) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"%s: HCI registration failed with errcode %d\n",
__func__, status);
goto err;
}
rsi_dbg(INIT_ZONE, "HCI Interface Created with name \'%s\'\n",
redpine_dbg(INIT_ZONE, "HCI Interface Created with name \'%s\'\n",
hdev->name);
common->bt_fsm_state = BT_DEVICE_READY;
rsi_dbg(ERR_ZONE, " HCI module init done...\n");
redpine_dbg(ERR_ZONE, " HCI module init done...\n");
return 0;
......@@ -424,7 +424,7 @@ void rsi_hci_detach(struct rsi_common *common)
(struct rsi_hci_adapter *)common->hci_adapter;
struct hci_dev *hdev;
rsi_dbg(INFO_ZONE, "Detaching HCI...\n");
redpine_dbg(INFO_ZONE, "Detaching HCI...\n");
if (!h_adapter)
return;
......
......@@ -195,13 +195,13 @@ static struct rsi_proto_ops g_proto_ops = {
#endif
/**
* rsi_dbg() - This function outputs informational messages.
* redpine_dbg() - This function outputs informational messages.
* @zone: Zone of interest for output message.
* @fmt: printf-style format for output message.
*
* Return: none
*/
void rsi_dbg(u32 zone, const char *fmt, ...)
void redpine_dbg(u32 zone, const char *fmt, ...)
{
struct va_format vaf;
va_list args;
......@@ -215,7 +215,7 @@ void rsi_dbg(u32 zone, const char *fmt, ...)
pr_info("%pV", &vaf);
va_end(args);
}
EXPORT_SYMBOL_GPL(rsi_dbg);
EXPORT_SYMBOL_GPL(redpine_dbg);
/**
* rsi_hex_dump() - This function prints the packet (/msg) in hex bytes.
......@@ -280,17 +280,17 @@ void rsi_print_version(struct rsi_common *common)
memcpy(common->driver_ver, DRV_VER, ARRAY_SIZE(DRV_VER));
common->driver_ver[ARRAY_SIZE(DRV_VER)] = '\0';
rsi_dbg(ERR_ZONE, "================================================\n");
rsi_dbg(ERR_ZONE, "================ RSI Version Info ==============\n");
rsi_dbg(ERR_ZONE, "================================================\n");
rsi_dbg(ERR_ZONE, "FW Version\t: %d.%d.%d\n",
redpine_dbg(ERR_ZONE, "================================================\n");
redpine_dbg(ERR_ZONE, "================ RSI Version Info ==============\n");
redpine_dbg(ERR_ZONE, "================================================\n");
redpine_dbg(ERR_ZONE, "FW Version\t: %d.%d.%d\n",
common->lmac_ver.major, common->lmac_ver.minor,
common->lmac_ver.release_num);
rsi_dbg(ERR_ZONE, "Driver Version\t: %s", common->driver_ver);
rsi_dbg(ERR_ZONE, "Operating mode\t: %d [%s]",
redpine_dbg(ERR_ZONE, "Driver Version\t: %s", common->driver_ver);
redpine_dbg(ERR_ZONE, "Operating mode\t: %d [%s]",
common->oper_mode, opmode_str(common->oper_mode));
rsi_dbg(ERR_ZONE, "Firmware file\t: %s", common->priv->fw_file_name);
rsi_dbg(ERR_ZONE, "================================================\n");
redpine_dbg(ERR_ZONE, "Firmware file\t: %s", common->priv->fw_file_name);
redpine_dbg(ERR_ZONE, "================================================\n");
}
/**
......@@ -316,7 +316,7 @@ static struct sk_buff *rsi_prepare_skb(struct rsi_common *common,
return NULL;
if (pkt_len > (RSI_RCV_BUFFER_LEN * 4)) {
rsi_dbg(ERR_ZONE, "%s: Pkt size > max rx buf size %d\n",
redpine_dbg(ERR_ZONE, "%s: Pkt size > max rx buf size %d\n",
__func__, pkt_len);
pkt_len = RSI_RCV_BUFFER_LEN * 4;
}
......@@ -340,13 +340,13 @@ static struct sk_buff *rsi_prepare_skb(struct rsi_common *common,
}
/**
* rsi_read_pkt() - This function reads frames from the card.
* redpine_read_pkt() - This function reads frames from the card.
* @common: Pointer to the driver private structure.
* @rcv_pkt_len: Received pkt length. In case of USB it is 0.
*
* Return: 0 on success, -1 on failure.
*/
int rsi_read_pkt(struct rsi_common *common, u8 *rx_pkt, s32 rcv_pkt_len)
int redpine_read_pkt(struct rsi_common *common, u8 *rx_pkt, s32 rcv_pkt_len)
{
u8 *frame_desc = NULL, extended_desc = 0;
u32 index = 0, length = 0, queueno = 0;
......@@ -367,7 +367,7 @@ int rsi_read_pkt(struct rsi_common *common, u8 *rx_pkt, s32 rcv_pkt_len)
if (queueno != RSI_ZIGB_Q) {
if ((actual_length < (4 + FRAME_DESC_SZ)) || (offset < 4)) {
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"%s: actual_length (%d) is less than 20 or"
" offset(%d) is less than 4\n",
__func__, actual_length, offset);
......@@ -430,12 +430,12 @@ int rsi_read_pkt(struct rsi_common *common, u8 *rx_pkt, s32 rcv_pkt_len)
zb_pkt_type = frame_desc[offset + ZB_RX_PKT_TYPE_OFST];
if ((zb_pkt_type == ZB_CARD_READY_IND) &&
(common->zb_fsm_state == ZB_DEVICE_NOT_READY)) {
rsi_dbg(INFO_ZONE, "ZIGB Card ready recvd\n");
redpine_dbg(INFO_ZONE, "ZIGB Card ready recvd\n");
common->zb_fsm_state = ZB_DEVICE_READY;
if (zb_ops && zb_ops->attach) {
if (zb_ops->attach(common,
&g_proto_ops))
rsi_dbg(ERR_ZONE,
redpine_dbg(ERR_ZONE,
"Failed to attach ZIGB module\n");
}
} else {
......@@ -448,7 +448,7 @@ int rsi_read_pkt(struct rsi_common *common, u8 *rx_pkt, s32 rcv_pkt_len)
#endif
default:
rsi_dbg(ERR_ZONE, "%s: pkt from invalid queue: %d\n",
redpine_dbg(ERR_ZONE, "%s: pkt from invalid queue: %d\n",
__func__, queueno);
goto fail;
}
......@@ -461,7 +461,7 @@ int rsi_read_pkt(struct rsi_common *common, u8 *rx_pkt, s32 rcv_pkt_len)
fail:
return -EINVAL;
}
EXPORT_SYMBOL_GPL(rsi_read_pkt);
EXPORT_SYMBOL_GPL(redpine_read_pkt);
/**
* rsi_tx_scheduler_thread() - This function is a kernel thread to send the
......@@ -513,7 +513,7 @@ void init_sdio_intr_status_poll_thread(struct rsi_common *common)
&common->sdio_intr_poll_thread,
rsi_sdio_intr_poll_scheduler_thread,
"Sdio Intr poll-Thread")) {
rsi_dbg(ERR_ZONE, "%s: Unable to init sdio intr poll thrd\n",
redpine_dbg(ERR_ZONE, "%s: Unable to init sdio intr poll thrd\n",