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

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

Merge tag 'cleanup-for-v3.18' of... 

Merge tag 'cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

 into next/cleanup

Pull "Clean-up for omaps for v3.18 merge window" from Tony Lindgren:

- Remove unused pieces of the legacy DMA API as we're moving to
  dmaengine API

- Search and replace to standardize on pr_warn instead of pr_warning

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: mach-omap2: Convert pr_warning to pr_warn
  ARM: OMAP: Remove unused pieces of legacy DMA API
parents 2b3a47d7 3d0cb73e

arch/arm/mach-omap2/display.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ int omap_dss_reset(struct omap_hwmod *oh) 
			MAX_MODULE_SOFTRESET_WAIT, c);



	if (c == MAX_MODULE_SOFTRESET_WAIT)

		pr_warning("dss_core: waiting for reset to finish failed\n");

		pr_warn("dss_core: waiting for reset to finish failed\n");

	else

		pr_debug("dss_core: softreset done\n");

arch/arm/mach-omap2/hdq1w.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int omap_hdq1w_reset(struct omap_hwmod *oh) 
			  MAX_MODULE_SOFTRESET_WAIT, c);



	if (c == MAX_MODULE_SOFTRESET_WAIT)

		pr_warning("%s: %s: softreset failed (waited %d usec)\n",

		pr_warn("%s: %s: softreset failed (waited %d usec)\n",

			__func__, oh->name, MAX_MODULE_SOFTRESET_WAIT);

	else

		pr_debug("%s: %s: softreset in %d usec\n", __func__,

arch/arm/mach-omap2/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int omap_i2c_reset(struct omap_hwmod *oh) 
				MAX_MODULE_SOFTRESET_WAIT, c);



	if (c == MAX_MODULE_SOFTRESET_WAIT)

		pr_warning("%s: %s: softreset failed (waited %d usec)\n",

		pr_warn("%s: %s: softreset failed (waited %d usec)\n",

			__func__, oh->name, MAX_MODULE_SOFTRESET_WAIT);

	else

		pr_debug("%s: %s: softreset in %d usec\n", __func__,

arch/arm/mach-omap2/msdi.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int omap_msdi_reset(struct omap_hwmod *oh) 
			  MAX_MODULE_SOFTRESET_WAIT, c);



	if (c == MAX_MODULE_SOFTRESET_WAIT)

		pr_warning("%s: %s: softreset failed (waited %d usec)\n",

		pr_warn("%s: %s: softreset failed (waited %d usec)\n",

			__func__, oh->name, MAX_MODULE_SOFTRESET_WAIT);

	else

		pr_debug("%s: %s: softreset in %d usec\n", __func__,

arch/arm/mach-omap2/mux.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ int __init omap_mux_late_init(void) 
			"hwmod_io", omap_mux_late_init);



	if (ret)

		pr_warning("mux: Failed to setup hwmod io irq %d\n", ret);

		pr_warn("mux: Failed to setup hwmod io irq %d\n", ret);



	return 0;

}