Skip to content

Commit

Permalink
ARM: 6928/1: SPEAr3xx: Make local shirq structures static
Browse files Browse the repository at this point in the history 
Several structures in arch/arm/mach-spear3xx are not marked static
like they should be. Fix this.

Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ryan Mallon authored and Russell King committed May 20, 2011
1 parent 66b848e commit f6558bf
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-spear3xx/spear300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ struct pmx_driver pmx_driver = {
};

/* spear3xx shared irq */
struct shirq_dev_config shirq_ras1_config[] = {
static struct shirq_dev_config shirq_ras1_config[] = {
{
.virq = VIRQ_IT_PERS_S,
.enb_mask = IT_PERS_S_IRQ_MASK,
Expand Down Expand Up @@ -411,7 +411,7 @@ struct shirq_dev_config shirq_ras1_config[] = {
},
};

struct spear_shirq shirq_ras1 = {
static struct spear_shirq shirq_ras1 = {
.irq = IRQ_GEN_RAS_1,
.dev_config = shirq_ras1_config,
.dev_count = ARRAY_SIZE(shirq_ras1_config),
Expand Down
16 changes: 8 additions & 8 deletions arch/arm/mach-spear3xx/spear310.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ struct pmx_driver pmx_driver = {
};

/* spear3xx shared irq */
struct shirq_dev_config shirq_ras1_config[] = {
static struct shirq_dev_config shirq_ras1_config[] = {
{
.virq = VIRQ_SMII0,
.status_mask = SMII0_IRQ_MASK,
Expand Down Expand Up @@ -168,7 +168,7 @@ struct shirq_dev_config shirq_ras1_config[] = {
},
};

struct spear_shirq shirq_ras1 = {
static struct spear_shirq shirq_ras1 = {
.irq = IRQ_GEN_RAS_1,
.dev_config = shirq_ras1_config,
.dev_count = ARRAY_SIZE(shirq_ras1_config),
Expand All @@ -180,7 +180,7 @@ struct spear_shirq shirq_ras1 = {
},
};

struct shirq_dev_config shirq_ras2_config[] = {
static struct shirq_dev_config shirq_ras2_config[] = {
{
.virq = VIRQ_UART1,
.status_mask = UART1_IRQ_MASK,
Expand All @@ -199,7 +199,7 @@ struct shirq_dev_config shirq_ras2_config[] = {
},
};

struct spear_shirq shirq_ras2 = {
static struct spear_shirq shirq_ras2 = {
.irq = IRQ_GEN_RAS_2,
.dev_config = shirq_ras2_config,
.dev_count = ARRAY_SIZE(shirq_ras2_config),
Expand All @@ -211,14 +211,14 @@ struct spear_shirq shirq_ras2 = {
},
};

struct shirq_dev_config shirq_ras3_config[] = {
static struct shirq_dev_config shirq_ras3_config[] = {
{
.virq = VIRQ_EMI,
.status_mask = EMI_IRQ_MASK,
},
};

struct spear_shirq shirq_ras3 = {
static struct spear_shirq shirq_ras3 = {
.irq = IRQ_GEN_RAS_3,
.dev_config = shirq_ras3_config,
.dev_count = ARRAY_SIZE(shirq_ras3_config),
Expand All @@ -230,7 +230,7 @@ struct spear_shirq shirq_ras3 = {
},
};

struct shirq_dev_config shirq_intrcomm_ras_config[] = {
static struct shirq_dev_config shirq_intrcomm_ras_config[] = {
{
.virq = VIRQ_TDM_HDLC,
.status_mask = TDM_HDLC_IRQ_MASK,
Expand All @@ -243,7 +243,7 @@ struct shirq_dev_config shirq_intrcomm_ras_config[] = {
},
};

struct spear_shirq shirq_intrcomm_ras = {
static struct spear_shirq shirq_intrcomm_ras = {
.irq = IRQ_INTRCOMM_RAS_ARM,
.dev_config = shirq_intrcomm_ras_config,
.dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config),
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/mach-spear3xx/spear320.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ struct pmx_driver pmx_driver = {
};

/* spear3xx shared irq */
struct shirq_dev_config shirq_ras1_config[] = {
static struct shirq_dev_config shirq_ras1_config[] = {
{
.virq = VIRQ_EMI,
.status_mask = EMI_IRQ_MASK,
Expand All @@ -401,7 +401,7 @@ struct shirq_dev_config shirq_ras1_config[] = {
},
};

struct spear_shirq shirq_ras1 = {
static struct spear_shirq shirq_ras1 = {
.irq = IRQ_GEN_RAS_1,
.dev_config = shirq_ras1_config,
.dev_count = ARRAY_SIZE(shirq_ras1_config),
Expand All @@ -414,7 +414,7 @@ struct spear_shirq shirq_ras1 = {
},
};

struct shirq_dev_config shirq_ras3_config[] = {
static struct shirq_dev_config shirq_ras3_config[] = {
{
.virq = VIRQ_PLGPIO,
.enb_mask = GPIO_IRQ_MASK,
Expand All @@ -433,7 +433,7 @@ struct shirq_dev_config shirq_ras3_config[] = {
},
};

struct spear_shirq shirq_ras3 = {
static struct spear_shirq shirq_ras3 = {
.irq = IRQ_GEN_RAS_3,
.dev_config = shirq_ras3_config,
.dev_count = ARRAY_SIZE(shirq_ras3_config),
Expand All @@ -447,7 +447,7 @@ struct spear_shirq shirq_ras3 = {
},
};

struct shirq_dev_config shirq_intrcomm_ras_config[] = {
static struct shirq_dev_config shirq_intrcomm_ras_config[] = {
{
.virq = VIRQ_CANU,
.status_mask = CAN_U_IRQ_MASK,
Expand Down Expand Up @@ -495,7 +495,7 @@ struct shirq_dev_config shirq_intrcomm_ras_config[] = {
},
};

struct spear_shirq shirq_intrcomm_ras = {
static struct spear_shirq shirq_intrcomm_ras = {
.irq = IRQ_INTRCOMM_RAS_ARM,
.dev_config = shirq_intrcomm_ras_config,
.dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config),
Expand Down

0 comments on commit f6558bf

Please sign in to comment.