| Message ID | 20210307035321.23810-1-aford173@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Lokesh Vutla |
| Headers | show |
| Series | arm: omap3: Make try_unlock_memory() static | expand |
On 07/03/21 9:23 am, Adam Ford wrote: > try_unlock_memory() is only used in one file, so make it static > in that file and remove it from the sys_proto header file. This > may help with some further optimization in the future. > > Signed-off-by: Adam Ford <aford173@gmail.com> one of omap3 board is failing to build. Can you take a look? https://source.denx.de/u-boot/custodians/u-boot-ti/-/jobs/237886 Thanks and regards, Lokesh > > diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h > index 32ac033515..656f848a73 100644 > --- a/arch/arm/include/asm/arch-omap3/sys_proto.h > +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h > @@ -60,7 +60,6 @@ u32 is_running_in_sram(void); > u32 is_running_in_flash(void); > u32 get_device_type(void); > void secureworld_exit(void); > -void try_unlock_memory(void); > u32 get_boot_type(void); > void invalidate_dcache(u32); > u32 wait_on_value(u32, u32, void *, u32); > diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c > index 029bd54595..c621177580 100644 > --- a/arch/arm/mach-omap2/omap3/board.c > +++ b/arch/arm/mach-omap2/omap3/board.c > @@ -145,7 +145,7 @@ void secureworld_exit(void) > * Description: If chip is GP/EMU(special) type, unlock the SRAM for > * general use. > *****************************************************************************/ > -void try_unlock_memory(void) > +static void try_unlock_memory(void) > { > int mode; > int in_sdram = is_running_in_sdram(); >
On Mon, Mar 15, 2021 at 1:43 AM Lokesh Vutla <lokeshvutla@ti.com> wrote: > > > > On 07/03/21 9:23 am, Adam Ford wrote: > > try_unlock_memory() is only used in one file, so make it static > > in that file and remove it from the sys_proto header file. This > > may help with some further optimization in the future. > > > > Signed-off-by: Adam Ford <aford173@gmail.com> > > one of omap3 board is failing to build. Can you take a look? > > https://source.denx.de/u-boot/custodians/u-boot-ti/-/jobs/237886 > Question on preference...Would you prefer I move the unused function into the #ifdef area, or should I just mark the function as __maybe_unused? I am not a fan of #ifdef, but I can move the function there that is your preference. adam > Thanks and regards, > Lokesh > > > > > diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h > > index 32ac033515..656f848a73 100644 > > --- a/arch/arm/include/asm/arch-omap3/sys_proto.h > > +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h > > @@ -60,7 +60,6 @@ u32 is_running_in_sram(void); > > u32 is_running_in_flash(void); > > u32 get_device_type(void); > > void secureworld_exit(void); > > -void try_unlock_memory(void); > > u32 get_boot_type(void); > > void invalidate_dcache(u32); > > u32 wait_on_value(u32, u32, void *, u32); > > diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c > > index 029bd54595..c621177580 100644 > > --- a/arch/arm/mach-omap2/omap3/board.c > > +++ b/arch/arm/mach-omap2/omap3/board.c > > @@ -145,7 +145,7 @@ void secureworld_exit(void) > > * Description: If chip is GP/EMU(special) type, unlock the SRAM for > > * general use. > > *****************************************************************************/ > > -void try_unlock_memory(void) > > +static void try_unlock_memory(void) > > { > > int mode; > > int in_sdram = is_running_in_sdram(); > >
On Tue, Mar 16, 2021 at 12:18:05PM -0500, Adam Ford wrote: > On Mon, Mar 15, 2021 at 1:43 AM Lokesh Vutla <lokeshvutla@ti.com> wrote: > > > > > > > > On 07/03/21 9:23 am, Adam Ford wrote: > > > try_unlock_memory() is only used in one file, so make it static > > > in that file and remove it from the sys_proto header file. This > > > may help with some further optimization in the future. > > > > > > Signed-off-by: Adam Ford <aford173@gmail.com> > > > > one of omap3 board is failing to build. Can you take a look? > > > > https://source.denx.de/u-boot/custodians/u-boot-ti/-/jobs/237886 > > > > Question on preference...Would you prefer I move the unused function > into the #ifdef area, or should I just mark the function as > __maybe_unused? I am not a fan of #ifdef, but I can move the > function there that is your preference. If there's already an #ifdef we should restructure the code to live there, yes.
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h index 32ac033515..656f848a73 100644 --- a/arch/arm/include/asm/arch-omap3/sys_proto.h +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h @@ -60,7 +60,6 @@ u32 is_running_in_sram(void); u32 is_running_in_flash(void); u32 get_device_type(void); void secureworld_exit(void); -void try_unlock_memory(void); u32 get_boot_type(void); void invalidate_dcache(u32); u32 wait_on_value(u32, u32, void *, u32); diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index 029bd54595..c621177580 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -145,7 +145,7 @@ void secureworld_exit(void) * Description: If chip is GP/EMU(special) type, unlock the SRAM for * general use. *****************************************************************************/ -void try_unlock_memory(void) +static void try_unlock_memory(void) { int mode; int in_sdram = is_running_in_sdram();
try_unlock_memory() is only used in one file, so make it static in that file and remove it from the sys_proto header file. This may help with some further optimization in the future. Signed-off-by: Adam Ford <aford173@gmail.com>