Skip to content

L
linux
Commit 1f997411 authored by Tugce Sirin's avatar Tugce Sirin Committed by Greg Kroah-Hartman
Browse files
Options

Staging: wlan-ng: Fix prefer netdev_info to printk 

This patch fixes checkpatch.pl error prefer netdev_info to printk in
wlan-ng driver.
Signed-off-by: default avatarTugce Sirin <ztugcesirin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80135b18
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
drivers/staging/wlan-ng/prism2sta.c
View file @ 1f997411
...@@ -633,7 +633,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -633,7 +633,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->ident_nic.major = le16_to_cpu(hw->ident_nic.major); hw->ident_nic.major = le16_to_cpu(hw->ident_nic.major);
hw->ident_nic.minor = le16_to_cpu(hw->ident_nic.minor); hw->ident_nic.minor = le16_to_cpu(hw->ident_nic.minor);
printk(KERN_INFO "ident: nic h/w: id=0x%02x %d.%d.%d\n", netdev_info(wlandev->netdev, "ident: nic h/w: id=0x%02x %d.%d.%d\n",
hw->ident_nic.id, hw->ident_nic.major, hw->ident_nic.id, hw->ident_nic.major,
hw->ident_nic.minor, hw->ident_nic.variant); hw->ident_nic.minor, hw->ident_nic.variant);
...@@ -652,7 +652,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -652,7 +652,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->ident_pri_fw.major = le16_to_cpu(hw->ident_pri_fw.major); hw->ident_pri_fw.major = le16_to_cpu(hw->ident_pri_fw.major);
hw->ident_pri_fw.minor = le16_to_cpu(hw->ident_pri_fw.minor); hw->ident_pri_fw.minor = le16_to_cpu(hw->ident_pri_fw.minor);
printk(KERN_INFO "ident: pri f/w: id=0x%02x %d.%d.%d\n", netdev_info(wlandev->netdev, "ident: pri f/w: id=0x%02x %d.%d.%d\n",
hw->ident_pri_fw.id, hw->ident_pri_fw.major, hw->ident_pri_fw.id, hw->ident_pri_fw.major,
hw->ident_pri_fw.minor, hw->ident_pri_fw.variant); hw->ident_pri_fw.minor, hw->ident_pri_fw.variant);
...@@ -683,12 +683,12 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -683,12 +683,12 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->ident_sta_fw.variant &= ~((u16) (BIT(14) | BIT(15))); hw->ident_sta_fw.variant &= ~((u16) (BIT(14) | BIT(15)));
if (hw->ident_sta_fw.id == 0x1f) { if (hw->ident_sta_fw.id == 0x1f) {
printk(KERN_INFO netdev_info(wlandev->netdev,
"ident: sta f/w: id=0x%02x %d.%d.%d\n", "ident: sta f/w: id=0x%02x %d.%d.%d\n",
hw->ident_sta_fw.id, hw->ident_sta_fw.major, hw->ident_sta_fw.id, hw->ident_sta_fw.major,
hw->ident_sta_fw.minor, hw->ident_sta_fw.variant); hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
} else { } else {
printk(KERN_INFO netdev_info(wlandev->netdev,
"ident: ap f/w: id=0x%02x %d.%d.%d\n", "ident: ap f/w: id=0x%02x %d.%d.%d\n",
hw->ident_sta_fw.id, hw->ident_sta_fw.major, hw->ident_sta_fw.id, hw->ident_sta_fw.major,
hw->ident_sta_fw.minor, hw->ident_sta_fw.variant); hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
...@@ -713,7 +713,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -713,7 +713,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_mfi.bottom = le16_to_cpu(hw->cap_sup_mfi.bottom); hw->cap_sup_mfi.bottom = le16_to_cpu(hw->cap_sup_mfi.bottom);
hw->cap_sup_mfi.top = le16_to_cpu(hw->cap_sup_mfi.top); hw->cap_sup_mfi.top = le16_to_cpu(hw->cap_sup_mfi.top);
printk(KERN_INFO netdev_info(wlandev->netdev,
"MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_mfi.role, hw->cap_sup_mfi.id, hw->cap_sup_mfi.role, hw->cap_sup_mfi.id,
hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom, hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom,
...@@ -736,7 +736,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -736,7 +736,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_cfi.bottom = le16_to_cpu(hw->cap_sup_cfi.bottom); hw->cap_sup_cfi.bottom = le16_to_cpu(hw->cap_sup_cfi.bottom);
hw->cap_sup_cfi.top = le16_to_cpu(hw->cap_sup_cfi.top); hw->cap_sup_cfi.top = le16_to_cpu(hw->cap_sup_cfi.top);
printk(KERN_INFO netdev_info(wlandev->netdev,
"CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_cfi.role, hw->cap_sup_cfi.id, hw->cap_sup_cfi.role, hw->cap_sup_cfi.id,
hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom, hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom,
...@@ -759,7 +759,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -759,7 +759,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_pri.bottom = le16_to_cpu(hw->cap_sup_pri.bottom); hw->cap_sup_pri.bottom = le16_to_cpu(hw->cap_sup_pri.bottom);
hw->cap_sup_pri.top = le16_to_cpu(hw->cap_sup_pri.top); hw->cap_sup_pri.top = le16_to_cpu(hw->cap_sup_pri.top);
printk(KERN_INFO netdev_info(wlandev->netdev,
"PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_pri.role, hw->cap_sup_pri.id, hw->cap_sup_pri.role, hw->cap_sup_pri.id,
hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom, hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom,
...@@ -783,13 +783,13 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -783,13 +783,13 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_sup_sta.top = le16_to_cpu(hw->cap_sup_sta.top); hw->cap_sup_sta.top = le16_to_cpu(hw->cap_sup_sta.top);
if (hw->cap_sup_sta.id == 0x04) { if (hw->cap_sup_sta.id == 0x04) {
printk(KERN_INFO netdev_info(wlandev->netdev,
"STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_sta.role, hw->cap_sup_sta.id, hw->cap_sup_sta.role, hw->cap_sup_sta.id,
hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
hw->cap_sup_sta.top); hw->cap_sup_sta.top);
} else { } else {
printk(KERN_INFO netdev_info(wlandev->netdev,
"AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_sup_sta.role, hw->cap_sup_sta.id, hw->cap_sup_sta.role, hw->cap_sup_sta.id,
hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
...@@ -813,7 +813,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -813,7 +813,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_act_pri_cfi.bottom = le16_to_cpu(hw->cap_act_pri_cfi.bottom); hw->cap_act_pri_cfi.bottom = le16_to_cpu(hw->cap_act_pri_cfi.bottom);
hw->cap_act_pri_cfi.top = le16_to_cpu(hw->cap_act_pri_cfi.top); hw->cap_act_pri_cfi.top = le16_to_cpu(hw->cap_act_pri_cfi.top);
printk(KERN_INFO netdev_info(wlandev->netdev,
"PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id, hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id,
hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom, hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom,
...@@ -836,7 +836,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -836,7 +836,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_act_sta_cfi.bottom = le16_to_cpu(hw->cap_act_sta_cfi.bottom); hw->cap_act_sta_cfi.bottom = le16_to_cpu(hw->cap_act_sta_cfi.bottom);
hw->cap_act_sta_cfi.top = le16_to_cpu(hw->cap_act_sta_cfi.top); hw->cap_act_sta_cfi.top = le16_to_cpu(hw->cap_act_sta_cfi.top);
printk(KERN_INFO netdev_info(wlandev->netdev,
"STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id, hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id,
hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom, hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom,
...@@ -859,7 +859,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -859,7 +859,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->cap_act_sta_mfi.bottom = le16_to_cpu(hw->cap_act_sta_mfi.bottom); hw->cap_act_sta_mfi.bottom = le16_to_cpu(hw->cap_act_sta_mfi.bottom);
hw->cap_act_sta_mfi.top = le16_to_cpu(hw->cap_act_sta_mfi.top); hw->cap_act_sta_mfi.top = le16_to_cpu(hw->cap_act_sta_mfi.top);
printk(KERN_INFO netdev_info(wlandev->netdev,
"STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id, hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id,
hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom, hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom,
...@@ -871,7 +871,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) ...@@ -871,7 +871,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
if (!result) { if (!result) {
wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN, wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN,
pstr, sizeof(pstr)); pstr, sizeof(pstr));
printk(KERN_INFO "Prism2 card SN: %s\n", pstr); netdev_info(wlandev->netdev, "Prism2 card SN: %s\n", pstr);
} else { } else {
netdev_err(wlandev->netdev, "Failed to retrieve Prism2 Card SN\n"); netdev_err(wlandev->netdev, "Failed to retrieve Prism2 Card SN\n");
goto failed; goto failed;
...@@ -1226,7 +1226,7 @@ void prism2sta_processing_defer(struct work_struct *data) ...@@ -1226,7 +1226,7 @@ void prism2sta_processing_defer(struct work_struct *data)
*/ */
netif_carrier_off(wlandev->netdev); netif_carrier_off(wlandev->netdev);
printk(KERN_INFO "linkstatus=NOTCONNECTED (unhandled)\n"); netdev_info(wlandev->netdev, "linkstatus=NOTCONNECTED (unhandled)\n");
break; break;
case HFA384x_LINK_CONNECTED: case HFA384x_LINK_CONNECTED:
...@@ -1253,7 +1253,7 @@ void prism2sta_processing_defer(struct work_struct *data) ...@@ -1253,7 +1253,7 @@ void prism2sta_processing_defer(struct work_struct *data)
if (wlandev->netdev->type == ARPHRD_ETHER) { if (wlandev->netdev->type == ARPHRD_ETHER) {
u16 portstatus; u16 portstatus;
printk(KERN_INFO "linkstatus=CONNECTED\n"); netdev_info(wlandev->netdev, "linkstatus=CONNECTED\n");
/* For non-usb devices, we can use the sync versions */ /* For non-usb devices, we can use the sync versions */
/* Collect the BSSID, and set state to allow tx */ /* Collect the BSSID, and set state to allow tx */
...@@ -1315,7 +1315,7 @@ void prism2sta_processing_defer(struct work_struct *data) ...@@ -1315,7 +1315,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* Block Transmits, Ignore receives of data frames * Block Transmits, Ignore receives of data frames
*/ */
if (wlandev->netdev->type == ARPHRD_ETHER) if (wlandev->netdev->type == ARPHRD_ETHER)
printk(KERN_INFO netdev_info(wlandev->netdev,
"linkstatus=DISCONNECTED (unhandled)\n"); "linkstatus=DISCONNECTED (unhandled)\n");
wlandev->macmode = WLAN_MACMODE_NONE; wlandev->macmode = WLAN_MACMODE_NONE;
...@@ -1341,7 +1341,7 @@ void prism2sta_processing_defer(struct work_struct *data) ...@@ -1341,7 +1341,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* Indicate Reassociation * Indicate Reassociation
* Enable Transmits, Receives and pass up data frames * Enable Transmits, Receives and pass up data frames
*/ */
printk(KERN_INFO "linkstatus=AP_CHANGE\n"); netdev_info(wlandev->netdev, "linkstatus=AP_CHANGE\n");
result = hfa384x_drvr_getconfig(hw, result = hfa384x_drvr_getconfig(hw,
HFA384x_RID_CURRENTBSSID, HFA384x_RID_CURRENTBSSID,
...@@ -1383,7 +1383,7 @@ void prism2sta_processing_defer(struct work_struct *data) ...@@ -1383,7 +1383,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* Response: * Response:
* Block Transmits, Ignore receives of data frames * Block Transmits, Ignore receives of data frames
*/ */
printk(KERN_INFO "linkstatus=AP_OUTOFRANGE (unhandled)\n"); netdev_info(wlandev->netdev, "linkstatus=AP_OUTOFRANGE (unhandled)\n");
netif_carrier_off(wlandev->netdev); netif_carrier_off(wlandev->netdev);
...@@ -1396,7 +1396,7 @@ void prism2sta_processing_defer(struct work_struct *data) ...@@ -1396,7 +1396,7 @@ void prism2sta_processing_defer(struct work_struct *data)
* Response: * Response:
* Enable Transmits, Receives and pass up data frames * Enable Transmits, Receives and pass up data frames
*/ */
printk(KERN_INFO "linkstatus=AP_INRANGE\n"); netdev_info(wlandev->netdev, "linkstatus=AP_INRANGE\n");
hw->link_status = HFA384x_LINK_CONNECTED; hw->link_status = HFA384x_LINK_CONNECTED;
netif_carrier_on(wlandev->netdev); netif_carrier_on(wlandev->netdev);
...@@ -1420,10 +1420,10 @@ void prism2sta_processing_defer(struct work_struct *data) ...@@ -1420,10 +1420,10 @@ void prism2sta_processing_defer(struct work_struct *data)
HFA384x_RID_JOINREQUEST, HFA384x_RID_JOINREQUEST,
&joinreq, &joinreq,
HFA384x_RID_JOINREQUEST_LEN); HFA384x_RID_JOINREQUEST_LEN);
printk(KERN_INFO netdev_info(wlandev->netdev,
"linkstatus=ASSOCFAIL (re-submitting join)\n"); "linkstatus=ASSOCFAIL (re-submitting join)\n");
} else { } else {
printk(KERN_INFO "linkstatus=ASSOCFAIL (unhandled)\n"); netdev_info(wlandev->netdev, "linkstatus=ASSOCFAIL (unhandled)\n");
} }
netif_carrier_off(wlandev->netdev); netif_carrier_off(wlandev->netdev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7