diff options
author | 2016-05-20 19:40:35 -0400 | |
---|---|---|
committer | 2016-05-20 19:40:35 -0400 | |
commit | 56025caa821d8e398b7cff2c45fb1e3e769549d7 (patch) | |
tree | 59d35e89cf27eb60aab334c7a53cfa3e99dacda0 /drivers/net/wireless/marvell | |
parent | net: cdc_ncm: update datagram size after changing mtu (diff) | |
parent | Merge ath-next from ath.git (diff) | |
download | linux-dev-56025caa821d8e398b7cff2c45fb1e3e769549d7.tar.xz linux-dev-56025caa821d8e398b7cff2c45fb1e3e769549d7.zip |
Merge tag 'wireless-drivers-next-for-davem-2016-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers patches for 4.7
Major changes:
iwlwifi
* remove IWLWIFI_DEBUG_EXPERIMENTAL_UCODE kconfig option
* work for RX multiqueue continues
* dynamic queue allocation work continues
* add Luca as maintainer
* a bunch of fixes and improvements all over
brcmfmac
* add 4356 sdio support
ath6kl
* add ability to set debug uart baud rate with a module parameter
wil6210
* add debugfs file to configure firmware led functionality
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/marvell')
-rw-r--r-- | drivers/net/wireless/marvell/mwifiex/pcie.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/marvell/mwifiex/sdio.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h index 5770b4396b21..2592e63c32cf 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.h +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h @@ -23,7 +23,6 @@ #define _MWIFIEX_PCIE_H #include <linux/pci.h> -#include <linux/pcieport_if.h> #include <linux/interrupt.h> #include "decl.h" @@ -117,7 +116,7 @@ /* FW awake cookie after FW ready */ #define FW_AWAKE_COOKIE (0xAA55AA55) #define MWIFIEX_DEF_SLEEP_COOKIE 0xBEEFBEEF -#define MWIFIEX_MAX_DELAY_COUNT 5 +#define MWIFIEX_MAX_DELAY_COUNT 100 struct mwifiex_pcie_card_reg { u16 cmd_addr_lo; diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index 099722e1f867..bdc51ffd43ec 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -104,7 +104,7 @@ static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card) if (!dev->of_node || !of_match_node(mwifiex_sdio_of_match_table, dev->of_node)) { - pr_err("sdio platform data not available"); + dev_err(dev, "sdio platform data not available\n"); return -1; } @@ -115,7 +115,8 @@ static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card) if (cfg && card->plt_of_node) { cfg->irq_wifi = irq_of_parse_and_map(card->plt_of_node, 0); if (!cfg->irq_wifi) { - dev_err(dev, "fail to parse irq_wifi from device tree"); + dev_err(dev, + "fail to parse irq_wifi from device tree\n"); } else { ret = devm_request_irq(dev, cfg->irq_wifi, mwifiex_wake_irq_wifi, |