diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-13 19:06:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-13 19:06:11 +0200 |
| commit | 961d9735357ec59be3e3e2c37c0ca6494f04461b (patch) | |
| tree | ee9d7538980724546b9184869e985da48d3891f5 /drivers/ssb/driver_chipcommon_sflash.c | |
| parent | liquidio: remove set but not used variable 'is25G' (diff) | |
| parent | ssb: Remove SSB_WARN_ON, SSB_BUG_ON and SSB_DEBUG (diff) | |
| download | linux-961d9735357ec59be3e3e2c37c0ca6494f04461b.tar.xz linux-961d9735357ec59be3e3e2c37c0ca6494f04461b.zip | |
Merge tag 'wireless-drivers-next-for-davem-2018-08-12' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
pull-request: wireless-drivers-next 2018-08-12
wireless-drivers-next patches for 4.19
Last set of new features for 4.19. Most notable is simplifying SSB
debugging code with two Kconfig option removals and fixing mt76 USB
build problems.
Major changes:
ath10k
* add debugfs file warm_hw_reset
wil6210
* add debugfs files tx_latency, link_stats and link_stats_global
* add 3-MSI support
* allow scan on AP interface
* support max aggregation window size 64
ssb
* remove CONFIG_SSB_SILENT and CONFIG_SSB_DEBUG Kconfig options
mt76
* fix build problems with recently added USB support
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ssb/driver_chipcommon_sflash.c')
| -rw-r--r-- | drivers/ssb/driver_chipcommon_sflash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ssb/driver_chipcommon_sflash.c b/drivers/ssb/driver_chipcommon_sflash.c index 937fc31971a7..fac0e6828288 100644 --- a/drivers/ssb/driver_chipcommon_sflash.c +++ b/drivers/ssb/driver_chipcommon_sflash.c @@ -5,10 +5,10 @@ * Licensed under the GNU/GPL. See COPYING for details. */ -#include <linux/ssb/ssb.h> - #include "ssb_private.h" +#include <linux/ssb/ssb.h> + static struct resource ssb_sflash_resource = { .name = "ssb_sflash", .start = SSB_FLASH2, @@ -80,7 +80,7 @@ static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode) return; cpu_relax(); } - pr_err("SFLASH control command failed (timeout)!\n"); + dev_err(cc->dev->dev, "SFLASH control command failed (timeout)!\n"); } /* Initialize serial flash access */ |