diff options
| author | Joe Perches <joe@perches.com> | 2010-07-26 17:39:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-27 15:14:13 -0400 |
| commit | c96c31e499b70964cfc88744046c998bb710e4b8 (patch) | |
| tree | 0157102fbc952e3646690f3491199607669eed69 /drivers/net/wireless/p54/p54pci.c | |
| parent | e1db74fcc3d95c8a051ec457241b5aa65a01a603 (diff) | |
drivers/net/wireless: Use wiphy_<level>
Standardize the logging macros used.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.c')
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index a5ea89cde8c4..822f8dc26e9c 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c | |||
| @@ -466,8 +466,7 @@ static int p54p_open(struct ieee80211_hw *dev) | |||
| 466 | P54P_READ(dev_int); | 466 | P54P_READ(dev_int); |
| 467 | 467 | ||
| 468 | if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) { | 468 | if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) { |
| 469 | printk(KERN_ERR "%s: Cannot boot firmware!\n", | 469 | wiphy_err(dev->wiphy, "cannot boot firmware!\n"); |
| 470 | wiphy_name(dev->wiphy)); | ||
| 471 | p54p_stop(dev); | 470 | p54p_stop(dev); |
| 472 | return -ETIMEDOUT; | 471 | return -ETIMEDOUT; |
| 473 | } | 472 | } |