diff options
author | Moritz Muehlenhoff <jmm@debian.org> | 2009-01-25 15:54:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:17 -0400 |
commit | 350f2f4bd6570f6f1996516ddd135ab2a95484de (patch) | |
tree | c5d5a9a1da48c8de6a7cdb9a9d20933f0253b343 /drivers/staging/wlan-ng/prism2sta.c | |
parent | 2d200d9f63786f7dd18d47e28c7b3eb8d261aae4 (diff) |
Staging: wlan-ng: Remove WLAN_LOG_INFO
Replace WLAN_LOG_INFO with printk() and remove it.
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/prism2sta.c')
-rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 8b9a80f3e9e..1e802fb8576 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c | |||
@@ -671,7 +671,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
671 | hw->ident_nic.major = hfa384x2host_16(hw->ident_nic.major); | 671 | hw->ident_nic.major = hfa384x2host_16(hw->ident_nic.major); |
672 | hw->ident_nic.minor = hfa384x2host_16(hw->ident_nic.minor); | 672 | hw->ident_nic.minor = hfa384x2host_16(hw->ident_nic.minor); |
673 | 673 | ||
674 | WLAN_LOG_INFO( "ident: nic h/w: id=0x%02x %d.%d.%d\n", | 674 | printk(KERN_INFO "ident: nic h/w: id=0x%02x %d.%d.%d\n", |
675 | hw->ident_nic.id, hw->ident_nic.major, | 675 | hw->ident_nic.id, hw->ident_nic.major, |
676 | hw->ident_nic.minor, hw->ident_nic.variant); | 676 | hw->ident_nic.minor, hw->ident_nic.variant); |
677 | 677 | ||
@@ -689,7 +689,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
689 | hw->ident_pri_fw.major = hfa384x2host_16(hw->ident_pri_fw.major); | 689 | hw->ident_pri_fw.major = hfa384x2host_16(hw->ident_pri_fw.major); |
690 | hw->ident_pri_fw.minor = hfa384x2host_16(hw->ident_pri_fw.minor); | 690 | hw->ident_pri_fw.minor = hfa384x2host_16(hw->ident_pri_fw.minor); |
691 | 691 | ||
692 | WLAN_LOG_INFO( "ident: pri f/w: id=0x%02x %d.%d.%d\n", | 692 | printk(KERN_INFO "ident: pri f/w: id=0x%02x %d.%d.%d\n", |
693 | hw->ident_pri_fw.id, hw->ident_pri_fw.major, | 693 | hw->ident_pri_fw.id, hw->ident_pri_fw.major, |
694 | hw->ident_pri_fw.minor, hw->ident_pri_fw.variant); | 694 | hw->ident_pri_fw.minor, hw->ident_pri_fw.variant); |
695 | 695 | ||
@@ -718,12 +718,12 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
718 | hw->ident_sta_fw.variant &= ~((u16)(BIT(14) | BIT(15))); | 718 | hw->ident_sta_fw.variant &= ~((u16)(BIT(14) | BIT(15))); |
719 | 719 | ||
720 | if ( hw->ident_sta_fw.id == 0x1f ) { | 720 | if ( hw->ident_sta_fw.id == 0x1f ) { |
721 | WLAN_LOG_INFO( | 721 | printk(KERN_INFO |
722 | "ident: sta f/w: id=0x%02x %d.%d.%d\n", | 722 | "ident: sta f/w: id=0x%02x %d.%d.%d\n", |
723 | hw->ident_sta_fw.id, hw->ident_sta_fw.major, | 723 | hw->ident_sta_fw.id, hw->ident_sta_fw.major, |
724 | hw->ident_sta_fw.minor, hw->ident_sta_fw.variant); | 724 | hw->ident_sta_fw.minor, hw->ident_sta_fw.variant); |
725 | } else { | 725 | } else { |
726 | WLAN_LOG_INFO( | 726 | printk(KERN_INFO |
727 | "ident: ap f/w: id=0x%02x %d.%d.%d\n", | 727 | "ident: ap f/w: id=0x%02x %d.%d.%d\n", |
728 | hw->ident_sta_fw.id, hw->ident_sta_fw.major, | 728 | hw->ident_sta_fw.id, hw->ident_sta_fw.major, |
729 | hw->ident_sta_fw.minor, hw->ident_sta_fw.variant); | 729 | hw->ident_sta_fw.minor, hw->ident_sta_fw.variant); |
@@ -747,7 +747,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
747 | hw->cap_sup_mfi.bottom = hfa384x2host_16(hw->cap_sup_mfi.bottom); | 747 | hw->cap_sup_mfi.bottom = hfa384x2host_16(hw->cap_sup_mfi.bottom); |
748 | hw->cap_sup_mfi.top = hfa384x2host_16(hw->cap_sup_mfi.top); | 748 | hw->cap_sup_mfi.top = hfa384x2host_16(hw->cap_sup_mfi.top); |
749 | 749 | ||
750 | WLAN_LOG_INFO( | 750 | printk(KERN_INFO |
751 | "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 751 | "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
752 | hw->cap_sup_mfi.role, hw->cap_sup_mfi.id, | 752 | hw->cap_sup_mfi.role, hw->cap_sup_mfi.id, |
753 | hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom, | 753 | hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom, |
@@ -769,7 +769,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
769 | hw->cap_sup_cfi.bottom = hfa384x2host_16(hw->cap_sup_cfi.bottom); | 769 | hw->cap_sup_cfi.bottom = hfa384x2host_16(hw->cap_sup_cfi.bottom); |
770 | hw->cap_sup_cfi.top = hfa384x2host_16(hw->cap_sup_cfi.top); | 770 | hw->cap_sup_cfi.top = hfa384x2host_16(hw->cap_sup_cfi.top); |
771 | 771 | ||
772 | WLAN_LOG_INFO( | 772 | printk(KERN_INFO |
773 | "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 773 | "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
774 | hw->cap_sup_cfi.role, hw->cap_sup_cfi.id, | 774 | hw->cap_sup_cfi.role, hw->cap_sup_cfi.id, |
775 | hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom, | 775 | hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom, |
@@ -791,7 +791,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
791 | hw->cap_sup_pri.bottom = hfa384x2host_16(hw->cap_sup_pri.bottom); | 791 | hw->cap_sup_pri.bottom = hfa384x2host_16(hw->cap_sup_pri.bottom); |
792 | hw->cap_sup_pri.top = hfa384x2host_16(hw->cap_sup_pri.top); | 792 | hw->cap_sup_pri.top = hfa384x2host_16(hw->cap_sup_pri.top); |
793 | 793 | ||
794 | WLAN_LOG_INFO( | 794 | printk(KERN_INFO |
795 | "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 795 | "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
796 | hw->cap_sup_pri.role, hw->cap_sup_pri.id, | 796 | hw->cap_sup_pri.role, hw->cap_sup_pri.id, |
797 | hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom, | 797 | hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom, |
@@ -814,13 +814,13 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
814 | hw->cap_sup_sta.top = hfa384x2host_16(hw->cap_sup_sta.top); | 814 | hw->cap_sup_sta.top = hfa384x2host_16(hw->cap_sup_sta.top); |
815 | 815 | ||
816 | if ( hw->cap_sup_sta.id == 0x04 ) { | 816 | if ( hw->cap_sup_sta.id == 0x04 ) { |
817 | WLAN_LOG_INFO( | 817 | printk(KERN_INFO |
818 | "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 818 | "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
819 | hw->cap_sup_sta.role, hw->cap_sup_sta.id, | 819 | hw->cap_sup_sta.role, hw->cap_sup_sta.id, |
820 | hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, | 820 | hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, |
821 | hw->cap_sup_sta.top); | 821 | hw->cap_sup_sta.top); |
822 | } else { | 822 | } else { |
823 | WLAN_LOG_INFO( | 823 | printk(KERN_INFO |
824 | "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 824 | "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
825 | hw->cap_sup_sta.role, hw->cap_sup_sta.id, | 825 | hw->cap_sup_sta.role, hw->cap_sup_sta.id, |
826 | hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, | 826 | hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom, |
@@ -843,7 +843,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
843 | hw->cap_act_pri_cfi.bottom = hfa384x2host_16(hw->cap_act_pri_cfi.bottom); | 843 | hw->cap_act_pri_cfi.bottom = hfa384x2host_16(hw->cap_act_pri_cfi.bottom); |
844 | hw->cap_act_pri_cfi.top = hfa384x2host_16(hw->cap_act_pri_cfi.top); | 844 | hw->cap_act_pri_cfi.top = hfa384x2host_16(hw->cap_act_pri_cfi.top); |
845 | 845 | ||
846 | WLAN_LOG_INFO( | 846 | printk(KERN_INFO |
847 | "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 847 | "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
848 | hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id, | 848 | hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id, |
849 | hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom, | 849 | hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom, |
@@ -865,7 +865,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
865 | hw->cap_act_sta_cfi.bottom = hfa384x2host_16(hw->cap_act_sta_cfi.bottom); | 865 | hw->cap_act_sta_cfi.bottom = hfa384x2host_16(hw->cap_act_sta_cfi.bottom); |
866 | hw->cap_act_sta_cfi.top = hfa384x2host_16(hw->cap_act_sta_cfi.top); | 866 | hw->cap_act_sta_cfi.top = hfa384x2host_16(hw->cap_act_sta_cfi.top); |
867 | 867 | ||
868 | WLAN_LOG_INFO( | 868 | printk(KERN_INFO |
869 | "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 869 | "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
870 | hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id, | 870 | hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id, |
871 | hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom, | 871 | hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom, |
@@ -887,7 +887,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
887 | hw->cap_act_sta_mfi.bottom = hfa384x2host_16(hw->cap_act_sta_mfi.bottom); | 887 | hw->cap_act_sta_mfi.bottom = hfa384x2host_16(hw->cap_act_sta_mfi.bottom); |
888 | hw->cap_act_sta_mfi.top = hfa384x2host_16(hw->cap_act_sta_mfi.top); | 888 | hw->cap_act_sta_mfi.top = hfa384x2host_16(hw->cap_act_sta_mfi.top); |
889 | 889 | ||
890 | WLAN_LOG_INFO( | 890 | printk(KERN_INFO |
891 | "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", | 891 | "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n", |
892 | hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id, | 892 | hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id, |
893 | hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom, | 893 | hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom, |
@@ -899,7 +899,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev) | |||
899 | if ( !result ) { | 899 | if ( !result ) { |
900 | wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN, | 900 | wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN, |
901 | pstr, sizeof(pstr)); | 901 | pstr, sizeof(pstr)); |
902 | WLAN_LOG_INFO("Prism2 card SN: %s\n", pstr); | 902 | printk(KERN_INFO "Prism2 card SN: %s\n", pstr); |
903 | } else { | 903 | } else { |
904 | WLAN_LOG_ERROR("Failed to retrieve Prism2 Card SN\n"); | 904 | WLAN_LOG_ERROR("Failed to retrieve Prism2 Card SN\n"); |
905 | goto failed; | 905 | goto failed; |
@@ -1263,7 +1263,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1263 | */ | 1263 | */ |
1264 | netif_carrier_off(wlandev->netdev); | 1264 | netif_carrier_off(wlandev->netdev); |
1265 | 1265 | ||
1266 | WLAN_LOG_INFO("linkstatus=NOTCONNECTED (unhandled)\n"); | 1266 | printk(KERN_INFO "linkstatus=NOTCONNECTED (unhandled)\n"); |
1267 | break; | 1267 | break; |
1268 | 1268 | ||
1269 | case HFA384x_LINK_CONNECTED: | 1269 | case HFA384x_LINK_CONNECTED: |
@@ -1288,7 +1288,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1288 | if ( wlandev->netdev->type == ARPHRD_ETHER ) { | 1288 | if ( wlandev->netdev->type == ARPHRD_ETHER ) { |
1289 | u16 portstatus; | 1289 | u16 portstatus; |
1290 | 1290 | ||
1291 | WLAN_LOG_INFO("linkstatus=CONNECTED\n"); | 1291 | printk(KERN_INFO "linkstatus=CONNECTED\n"); |
1292 | 1292 | ||
1293 | /* For non-usb devices, we can use the sync versions */ | 1293 | /* For non-usb devices, we can use the sync versions */ |
1294 | /* Collect the BSSID, and set state to allow tx */ | 1294 | /* Collect the BSSID, and set state to allow tx */ |
@@ -1351,10 +1351,10 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1351 | hfa384x_drvr_setconfig( hw, | 1351 | hfa384x_drvr_setconfig( hw, |
1352 | HFA384x_RID_JOINREQUEST, | 1352 | HFA384x_RID_JOINREQUEST, |
1353 | &joinreq, HFA384x_RID_JOINREQUEST_LEN); | 1353 | &joinreq, HFA384x_RID_JOINREQUEST_LEN); |
1354 | WLAN_LOG_INFO("linkstatus=DISCONNECTED (re-submitting join)\n"); | 1354 | printk(KERN_INFO "linkstatus=DISCONNECTED (re-submitting join)\n"); |
1355 | } else { | 1355 | } else { |
1356 | if (wlandev->netdev->type == ARPHRD_ETHER) | 1356 | if (wlandev->netdev->type == ARPHRD_ETHER) |
1357 | WLAN_LOG_INFO("linkstatus=DISCONNECTED (unhandled)\n"); | 1357 | printk(KERN_INFO "linkstatus=DISCONNECTED (unhandled)\n"); |
1358 | } | 1358 | } |
1359 | wlandev->macmode = WLAN_MACMODE_NONE; | 1359 | wlandev->macmode = WLAN_MACMODE_NONE; |
1360 | 1360 | ||
@@ -1377,7 +1377,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1377 | * Indicate Reassociation | 1377 | * Indicate Reassociation |
1378 | * Enable Transmits, Receives and pass up data frames | 1378 | * Enable Transmits, Receives and pass up data frames |
1379 | */ | 1379 | */ |
1380 | WLAN_LOG_INFO("linkstatus=AP_CHANGE\n"); | 1380 | printk(KERN_INFO "linkstatus=AP_CHANGE\n"); |
1381 | 1381 | ||
1382 | result = hfa384x_drvr_getconfig(hw, | 1382 | result = hfa384x_drvr_getconfig(hw, |
1383 | HFA384x_RID_CURRENTBSSID, | 1383 | HFA384x_RID_CURRENTBSSID, |
@@ -1419,7 +1419,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1419 | * Response: | 1419 | * Response: |
1420 | * Block Transmits, Ignore receives of data frames | 1420 | * Block Transmits, Ignore receives of data frames |
1421 | */ | 1421 | */ |
1422 | WLAN_LOG_INFO("linkstatus=AP_OUTOFRANGE (unhandled)\n"); | 1422 | printk(KERN_INFO "linkstatus=AP_OUTOFRANGE (unhandled)\n"); |
1423 | 1423 | ||
1424 | netif_carrier_off(wlandev->netdev); | 1424 | netif_carrier_off(wlandev->netdev); |
1425 | 1425 | ||
@@ -1432,7 +1432,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1432 | * Response: | 1432 | * Response: |
1433 | * Enable Transmits, Receives and pass up data frames | 1433 | * Enable Transmits, Receives and pass up data frames |
1434 | */ | 1434 | */ |
1435 | WLAN_LOG_INFO("linkstatus=AP_INRANGE\n"); | 1435 | printk(KERN_INFO "linkstatus=AP_INRANGE\n"); |
1436 | 1436 | ||
1437 | hw->link_status = HFA384x_LINK_CONNECTED; | 1437 | hw->link_status = HFA384x_LINK_CONNECTED; |
1438 | netif_carrier_on(wlandev->netdev); | 1438 | netif_carrier_on(wlandev->netdev); |
@@ -1456,9 +1456,9 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1456 | hfa384x_drvr_setconfig( hw, | 1456 | hfa384x_drvr_setconfig( hw, |
1457 | HFA384x_RID_JOINREQUEST, | 1457 | HFA384x_RID_JOINREQUEST, |
1458 | &joinreq, HFA384x_RID_JOINREQUEST_LEN); | 1458 | &joinreq, HFA384x_RID_JOINREQUEST_LEN); |
1459 | WLAN_LOG_INFO("linkstatus=ASSOCFAIL (re-submitting join)\n"); | 1459 | printk(KERN_INFO "linkstatus=ASSOCFAIL (re-submitting join)\n"); |
1460 | } else { | 1460 | } else { |
1461 | WLAN_LOG_INFO("linkstatus=ASSOCFAIL (unhandled)\n"); | 1461 | printk(KERN_INFO "linkstatus=ASSOCFAIL (unhandled)\n"); |
1462 | } | 1462 | } |
1463 | 1463 | ||
1464 | netif_carrier_off(wlandev->netdev); | 1464 | netif_carrier_off(wlandev->netdev); |