Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6558bf9 authored by Ryan Mallon's avatar Ryan Mallon Committed by Russell King
Browse files

ARM: 6928/1: SPEAr3xx: Make local shirq structures static 



Several structures in arch/arm/mach-spear3xx are not marked static
like they should be. Fix this.

Reviewed-by: default avatarStanley Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 66b848e4

arch/arm/mach-spear3xx/spear300.c

+2 −2
Original line number Diff line number Diff line
@@ -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,
@@ -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),

arch/arm/mach-spear3xx/spear310.c

+8 −8
Original line number Diff line number Diff line
@@ -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,
@@ -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),
@@ -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,
@@ -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),
@@ -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),
@@ -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,
@@ -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),

arch/arm/mach-spear3xx/spear320.c

+6 −6
Original line number Diff line number Diff line
@@ -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,
@@ -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),
@@ -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,
@@ -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),
@@ -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,
@@ -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),