Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa8f21a8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc_drivers_for_4.17' of... 

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()
parents f46f11dc a817e5d8

drivers/memory/emif.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/memory/ti-emif-pm.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}