diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:48:44 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:49:12 +0100 |
| commit | aa8f21a8a982c882f9d4f328e197ab50bf125e06 (patch) | |
| tree | dc171f042f5211a90bc15c4270415e6265f19e4e /drivers/memory | |
| parent | f46f11dc1e86270935041fbc3920ba71a050a5fd (diff) | |
| parent | a817e5d82a2dc5daaa0a8a66cfab268fdf2f6bb6 (diff) | |
| download | linux-aa8f21a8a982c882f9d4f328e197ab50bf125e06.tar.gz linux-aa8f21a8a982c882f9d4f328e197ab50bf125e06.tar.bz2 linux-aa8f21a8a982c882f9d4f328e197ab50bf125e06.zip | |
Merge tag 'soc_drivers_for_4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
Pull "SOC driver changes for v4.17" from Santosh Shilimkar:
- Remove redundant dev_err from probe in ti-emif-srma driver
- Make use of seq_putc in emif reg show
* tag 'soc_drivers_for_4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
memory: ti-emif-sram: remove redundant dev_err call in ti_emif_probe()
memory-EMIF: Use seq_putc() in emif_regdump_show()
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/emif.c | 2 | ||||
| -rw-r--r-- | drivers/memory/ti-emif-pm.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 04644e7b42b1..2f214440008c 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -127,7 +127,7 @@ static int emif_regdump_show(struct seq_file *s, void *unused) for (i = 0; i < EMIF_MAX_NUM_FREQUENCIES && regs_cache[i]; i++) { do_emif_regdump_show(s, emif, regs_cache[i]); - seq_printf(s, "\n"); + seq_putc(s, '\n'); } return 0; diff --git a/drivers/memory/ti-emif-pm.c b/drivers/memory/ti-emif-pm.c index 62a86c4bcd0b..632651f4b6e8 100644 --- a/drivers/memory/ti-emif-pm.c +++ b/drivers/memory/ti-emif-pm.c @@ -271,7 +271,6 @@ static int ti_emif_probe(struct platform_device *pdev) emif_data->pm_data.ti_emif_base_addr_virt = devm_ioremap_resource(dev, res); if (IS_ERR(emif_data->pm_data.ti_emif_base_addr_virt)) { - dev_err(dev, "could not ioremap emif mem\n"); ret = PTR_ERR(emif_data->pm_data.ti_emif_base_addr_virt); return ret; } |