Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'omap-for-v4.21/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omaps for v4.21 merge window

Few more non-critical section annotation fixes for Clang and
remove obsolete timer header inclusion.

* tag 'omap-for-v4.21/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: timer: Remove obsolete inclusion of <asm/smp_twd.h>
ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup
ARM: OMAP2+: hwmod: Fix some section annotations

Signed-off-by: Olof Johansson <olof@lixom.net>

+4 -5
+3 -3
arch/arm/mach-omap2/omap_hwmod.c
··· 2413 2413 * a stub; implementing this properly requires iclk autoidle usecounting in 2414 2414 * the clock code. No return value. 2415 2415 */ 2416 - static void __init _setup_iclk_autoidle(struct omap_hwmod *oh) 2416 + static void _setup_iclk_autoidle(struct omap_hwmod *oh) 2417 2417 { 2418 2418 struct omap_hwmod_ocp_if *os; 2419 2419 ··· 2444 2444 * reset. Returns 0 upon success or a negative error code upon 2445 2445 * failure. 2446 2446 */ 2447 - static int __init _setup_reset(struct omap_hwmod *oh) 2447 + static int _setup_reset(struct omap_hwmod *oh) 2448 2448 { 2449 2449 int r; 2450 2450 ··· 2505 2505 * 2506 2506 * No return value. 2507 2507 */ 2508 - static void __init _setup_postsetup(struct omap_hwmod *oh) 2508 + static void _setup_postsetup(struct omap_hwmod *oh) 2509 2509 { 2510 2510 u8 postsetup_state; 2511 2511
+1 -1
arch/arm/mach-omap2/prm44xx.c
··· 351 351 * to occur, WAKEUPENABLE bits must be set in the pad mux registers, and 352 352 * omap44xx_prm_reconfigure_io_chain() must be called. No return value. 353 353 */ 354 - static void __init omap44xx_prm_enable_io_wakeup(void) 354 + static void omap44xx_prm_enable_io_wakeup(void) 355 355 { 356 356 s32 inst = omap4_prmst_get_prm_dev_inst(); 357 357
-1
arch/arm/mach-omap2/timer.c
··· 44 44 #include <linux/sched_clock.h> 45 45 46 46 #include <asm/mach/time.h> 47 - #include <asm/smp_twd.h> 48 47 49 48 #include "omap_hwmod.h" 50 49 #include "omap_device.h"