leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SoC changes for omaps for v4.21 merge window

Browse Source 
Few more non-critical section annotation fixes for Clang and
 remove obsolete timer header inclusion.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlwAP/wRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXOcEw//Q1PXPybIlR9OwkqOkTM2s79p5SzXwRA6
 rNjKum9nIfw04U2iwEd9uh20qkYt/uVmLvZtE+dZQ2VG8CcC0I7NOlH3XaY3cSeA
 yHYIu+eLtz1WSh63V3/H+SqfNZ+PYLyJTn8fvVXZg7xKL9nk9OMcNoxWryy25cu9
 C7bnVaQWzwzQSjccYqyRZfGOvoGDfK34fw6JrqjUkOoGEnzjrQzHagFgQu4xWStw
 uTIngJyPCkVUmnNAfPNuvNSr+72AWUFm7iYExiKvEz0MsZXPlBuLnnwoJF67wgj6
 TczpzWpWrQfmrWQLtkIhMETrrOF33e23NzIetHD8qZ4eLs72mervEBCZkFefJlSs
 S4RE3h2NZeT25IQSZor7UGHu2M9u9Ml/cJoQzi1oyEMCdkUg63o6IDSQxR6aBubW
 H9Pgu7mFlLMkl/IZTrub0HKXZ/0HAnNviNHFCUjSFJLi2Y9qvwQyT9IKsDEZ7qWd
 yrhvbKA5npoeRUFZUajd5FRD5f0IHpOBv6y+AO05942OteqkZTt5BdjWqtTCeep8
 iNuhvTRKHf8QAWFdYyBKB40w1pV90MUDu10qgOqhapULuZsQT3aDOh+XDEotTNL+
 yyIUCu+lJaXWSXGprshfnEJdQqnKxee72s3OGEIjobxggXJ8sDFUCeKj/TM2jL5w
 H4bMtW0UP+s=
 =rtgC
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2018-11-30 15:50:54 -08:00
commit 3773b5c94e
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -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;

2
arch/arm/mach-omap2/prm44xx.c
View File

@ -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();

1
arch/arm/mach-omap2/timer.c
View File

@ -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"