Commit 3773b5c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.21/soc-signed' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents e47feed9 b7645533

arch/arm/mach-omap2/omap_hwmod.c

+3 −3
Original line number Diff line number Diff line
@@ -2413,7 +2413,7 @@ static int __init _init(struct omap_hwmod *oh, void *data) 
 * a stub; implementing this properly requires iclk autoidle usecounting in

 * the clock code.   No return value.

 */

static void __init _setup_iclk_autoidle(struct omap_hwmod *oh)

static void _setup_iclk_autoidle(struct omap_hwmod *oh)

{

	struct omap_hwmod_ocp_if *os;
@@ -2444,7 +2444,7 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh) 
 * reset.  Returns 0 upon success or a negative error code upon

 * failure.

 */

static int __init _setup_reset(struct omap_hwmod *oh)

static int _setup_reset(struct omap_hwmod *oh)

{

	int r;
@@ -2505,7 +2505,7 @@ static int __init _setup_reset(struct omap_hwmod *oh) 
 *

 * No return value.

 */

static void __init _setup_postsetup(struct omap_hwmod *oh)

static void _setup_postsetup(struct omap_hwmod *oh)

{

	u8 postsetup_state;

arch/arm/mach-omap2/prm44xx.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void omap44xx_prm_reconfigure_io_chain(void) 
 * to occur, WAKEUPENABLE bits must be set in the pad mux registers, and

 * omap44xx_prm_reconfigure_io_chain() must be called.  No return value.

 */

static void __init omap44xx_prm_enable_io_wakeup(void)

static void omap44xx_prm_enable_io_wakeup(void)

{

	s32 inst = omap4_prmst_get_prm_dev_inst();

arch/arm/mach-omap2/timer.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include <linux/sched_clock.h>



#include <asm/mach/time.h>

#include <asm/smp_twd.h>



#include "omap_hwmod.h"

#include "omap_device.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE