mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

mwl8k: separate driver and device info reporting during probe

Browse source 
Only print the driver version once, and condense all per-PHY
information to a single line.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek 2009-08-24 15:48:07 +02:00 committed by John W. Linville
parent 76c962a204
commit 2aa7b01fe4
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/net/wireless/mwl8k.c
View file

@ -164,7 +164,7 @@ struct mwl8k_priv {
u16 num_mcaddrs; u16 num_mcaddrs;
u8 hw_rev; u8 hw_rev;
__le32 fw_rev; u32 fw_rev;
/* /*
* Running count of TX packets in flight, to avoid * Running count of TX packets in flight, to avoid
@ -2825,11 +2825,16 @@ static void mwl8k_finalize_join_worker(struct work_struct *work)
static int __devinit mwl8k_probe(struct pci_dev *pdev, static int __devinit mwl8k_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
static int printed_version = 0;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
struct mwl8k_priv *priv; struct mwl8k_priv *priv;
int rc; int rc;
int i; int i;
u8 *fw;
if (!printed_version) {
printk(KERN_INFO "%s version %s\n", MWL8K_DESC, MWL8K_VERSION);
printed_version = 1;
}
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (rc) { if (rc) {
@ -3004,13 +3009,11 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
goto err_stop_firmware; goto err_stop_firmware;
} }
fw = (u8 *)&priv->fw_rev; printk(KERN_INFO "%s: 88w%u v%d, %pM, firmware version %u.%u.%u.%u\n",
printk(KERN_INFO "%s: 88W%u %s\n", priv->name, priv->part_num, wiphy_name(hw->wiphy), priv->part_num, priv->hw_rev,
MWL8K_DESC); hw->wiphy->perm_addr,
printk(KERN_INFO "%s: Driver Ver:%s Firmware Ver:%u.%u.%u.%u\n", (priv->fw_rev >> 24) & 0xff, (priv->fw_rev >> 16) & 0xff,
priv->name, MWL8K_VERSION, fw[3], fw[2], fw[1], fw[0]); (priv->fw_rev >> 8) & 0xff, priv->fw_rev & 0xff);
printk(KERN_INFO "%s: MAC Address: %pM\n", priv->name,
hw->wiphy->perm_addr);
return 0; return 0;