diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-30 01:31:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-30 01:31:51 -0400 |
| commit | 4e9f4b39426de5053308ceadbfa3d066b7ef1288 (patch) | |
| tree | 6552e3650136dfb0d554b1784ca45bba831b7d8f /drivers/net/wireless | |
| parent | df90a497047e41a67c0563e81496a2dc0d2f562d (diff) | |
| parent | 15b95a15950238eff4d7f24be1716086eea67835 (diff) | |
| download | linux-4e9f4b39426de5053308ceadbfa3d066b7ef1288.tar.gz linux-4e9f4b39426de5053308ceadbfa3d066b7ef1288.tar.bz2 linux-4e9f4b39426de5053308ceadbfa3d066b7ef1288.zip | |
Merge tag 'wireless-drivers-next-for-davem-2016-09-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
wireless-drivers-next patches for 4.9
Major changes:
iwlwifi
* work for new hardware support continues
* dynamic queue allocation stabilization
* improvements in the MSIx code
* multiqueue support work continues
* new firmware version support (API 26)
* add 8275 series support
* add 9560 series support
* add support for MU-MIMO sniffer
* add support for RRM by scan
* add support for "reverse" rx packet injection faking hw descriptors
* migrate to devm memory allocation handling
* Remove support for older firmwares (API older than -17 and -22)
wl12xx
* support booting the same rootfs with both wl12xx and wl18xx
hostap
* mark the driver as obsolete
ath9k
* disable RNG by default
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless')
121 files changed, 2381 insertions, 1434 deletions
diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c index b99ad5df383d..766c63bf05c4 100644 --- a/drivers/net/wireless/ath/ath10k/ahb.c +++ b/drivers/net/wireless/ath/ath10k/ahb.c @@ -91,59 +91,37 @@ static int ath10k_ahb_clock_init(struct ath10k *ar) { struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar); struct device *dev; - int ret; dev = &ar_ahb->pdev->dev; - ar_ahb->cmd_clk = clk_get(dev, "wifi_wcss_cmd"); + ar_ahb->cmd_clk = devm_clk_get(dev, "wifi_wcss_cmd"); if (IS_ERR_OR_NULL(ar_ahb->cmd_clk)) { ath10k_err(ar, "failed to get cmd clk: %ld\n", PTR_ERR(ar |