Skip to content

Commit

Permalink
powerpc/cpm1: Mark micropatch code/data static and __init
Browse files Browse the repository at this point in the history
This saves runtime memory and fixes lots of sparse warnings like this:

    CHECK   arch/powerpc/sysdev/micropatch.c
  arch/powerpc/sysdev/micropatch.c:27:6: warning: symbol 'patch_2000'
  was not declared. Should it be static?
  arch/powerpc/sysdev/micropatch.c:146:6: warning: symbol 'patch_2f00'
  was not declared. Should it be static?
  ...

Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Anton Vorontsov authored and Kumar Gala committed Jul 11, 2010
1 parent 2069a6a commit af71bcf
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
3 changes: 2 additions & 1 deletion arch/powerpc/include/asm/cpm1.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#ifndef __CPM1__
#define __CPM1__

#include <linux/init.h>
#include <asm/8xx_immap.h>
#include <asm/ptrace.h>
#include <asm/cpm.h>
Expand Down Expand Up @@ -54,7 +55,7 @@ extern cpm8xx_t __iomem *cpmp; /* Pointer to comm processor */

extern void cpm_setbrg(uint brg, uint rate);

extern void cpm_load_patch(cpm8xx_t *cp);
extern void __init cpm_load_patch(cpm8xx_t *cp);

extern void cpm_reset(void);

Expand Down
18 changes: 9 additions & 9 deletions arch/powerpc/sysdev/micropatch.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* also relocates SMC2, but this would require additional changes
* to uart.c, so I am holding off on that for a moment.
*/
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
Expand All @@ -25,7 +26,7 @@

#ifdef CONFIG_I2C_SPI_UCODE_PATCH

uint patch_2000[] = {
static uint patch_2000[] __initdata = {
0x7FFFEFD9,
0x3FFD0000,
0x7FFB49F7,
Expand Down Expand Up @@ -144,7 +145,7 @@ uint patch_2000[] = {
0x5F8247F8
};

uint patch_2f00[] = {
static uint patch_2f00[] __initdata = {
0x3E303430,
0x34343737,
0xABF7BF9B,
Expand Down Expand Up @@ -183,7 +184,7 @@ uint patch_2f00[] = {

#ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH

uint patch_2000[] = {
static uint patch_2000[] __initdata = {
0x3fff0000,
0x3ffd0000,
0x3ffb0000,
Expand Down Expand Up @@ -506,7 +507,7 @@ uint patch_2000[] = {
0x6079e2bb
};

uint patch_2f00[] = {
static uint patch_2f00[] __initdata = {
0x30303030,
0x3e3e3434,
0xabbf9b99,
Expand Down Expand Up @@ -573,7 +574,7 @@ uint patch_2f00[] = {
0xf22f3f23
};

uint patch_2e00[] = {
static uint patch_2e00[] __initdata = {
0x27eeeeee,
0xeeeeeeee,
0xeeeeeeee,
Expand All @@ -599,7 +600,7 @@ uint patch_2e00[] = {

#ifdef CONFIG_USB_SOF_UCODE_PATCH

uint patch_2000[] = {
static uint patch_2000[] __initdata = {
0x7fff0000,
0x7ffd0000,
0x7ffb0000,
Expand All @@ -614,15 +615,14 @@ uint patch_2000[] = {
0x60750000
};

uint patch_2f00[] = {
static uint patch_2f00[] __initdata = {
0x3030304c,
0xcab9e441,
0xa1aaf220
};
#endif

void
cpm_load_patch(cpm8xx_t *cp)
void __init cpm_load_patch(cpm8xx_t *cp)
{
volatile uint *dp; /* Dual-ported RAM. */
volatile cpm8xx_t *commproc;
Expand Down

0 comments on commit af71bcf

Please sign in to comment.