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

Commit 3c6bee1d authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] turn "const static" into "static const" 

ICC likes to complain about storage class not being first, GCC doesn't
care much (except for cases like "inline static").
have a hard time seeing how it could break anything.

Thanks to Gabriel A. Devenyi for pointing out
http://linuxicc.sourceforge.net/

 which is what made me create this patch.

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e7c368b7

arch/arm/plat-omap/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int dma_chan_count; 
static spinlock_t dma_chan_lock;

static struct omap_dma_lch dma_chan[OMAP_LOGICAL_DMA_CH_COUNT];



const static u8 omap1_dma_irq[OMAP_LOGICAL_DMA_CH_COUNT] = {

static const u8 omap1_dma_irq[OMAP_LOGICAL_DMA_CH_COUNT] = {

	INT_DMA_CH0_6, INT_DMA_CH1_7, INT_DMA_CH2_8, INT_DMA_CH3,

	INT_DMA_CH4, INT_DMA_CH5, INT_1610_DMA_CH6, INT_1610_DMA_CH7,

	INT_1610_DMA_CH8, INT_1610_DMA_CH9, INT_1610_DMA_CH10,

arch/h8300/kernel/gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ int h8300_get_gpio_dir(int port_bit) 
static char *port_status(int portno)

{

	static char result[10];

	const static char io[2]={'I','O'};

	static const char io[2]={'I','O'};

	char *rp;

	int c;

	unsigned char used,ddr;
@@ -143,7 +143,7 @@ static int gpio_proc_read(char *buf, char **start, off_t offset, 
                          int len, int *unused_i, void *unused_v)

{

	int c,outlen;

	const static char port_name[]="123456789ABCDEFGH";

	static const char port_name[]="123456789ABCDEFGH";

	outlen = 0;

	for (c = 0; c < MAX_PORT; c++) {

		if (ddrs[c] == NULL)

arch/h8300/platform/h8300h/ptrace_h8300h.c

+6 −6
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct optable { 
		.type       = jmp, \

	}



const static struct optable optable_0[] = {

static const struct optable optable_0[] = {

	OPTABLE(0x00,0xff, 1,none), /* 0x00 */

	OPTABLE(0x01,0xff,-1,none), /* 0x01 */

	OPTABLE(0x02,0xfe, 1,none), /* 0x02-0x03 */
@@ -131,31 +131,31 @@ const static struct optable optable_0[] = { 
	OPTABLE(0x80,0x80, 1,none), /* 0x80-0xff */

};



const static struct optable optable_1[] = {

static const struct optable optable_1[] = {

	OPTABLE(0x00,0xff,-3,none), /* 0x0100 */

	OPTABLE(0x40,0xf0,-3,none), /* 0x0140-0x14f */

	OPTABLE(0x80,0xf0, 1,none), /* 0x0180-0x018f */

	OPTABLE(0xc0,0xc0, 2,none), /* 0x01c0-0x01ff */

};



const static struct optable optable_2[] = {

static const struct optable optable_2[] = {

	OPTABLE(0x00,0x20, 2,none), /* 0x6a0?/0x6a8?/0x6b0?/0x6b8? */

	OPTABLE(0x20,0x20, 3,none), /* 0x6a2?/0x6aa?/0x6b2?/0x6ba? */

};



const static struct optable optable_3[] = {

static const struct optable optable_3[] = {

	OPTABLE(0x69,0xfb, 2,none), /* 0x010069/0x01006d/014069/0x01406d */

	OPTABLE(0x6b,0xff,-4,none), /* 0x01006b/0x01406b */

	OPTABLE(0x6f,0xff, 3,none), /* 0x01006f/0x01406f */

	OPTABLE(0x78,0xff, 5,none), /* 0x010078/0x014078 */

};



const static struct optable optable_4[] = {

static const struct optable optable_4[] = {

	OPTABLE(0x00,0x78, 3,none), /* 0x0100690?/0x01006d0?/0140690/0x01406d0?/0x0100698?/0x01006d8?/0140698?/0x01406d8? */

	OPTABLE(0x20,0x78, 4,none), /* 0x0100692?/0x01006d2?/0140692/0x01406d2?/0x010069a?/0x01006da?/014069a?/0x01406da? */

};



const static struct optables_list {

static const struct optables_list {

	const struct optable *ptr;

	int size;

} optables[] = {

arch/h8300/platform/h8s/ints.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct irq_pins { 
	unsigned char bit_no;

};

/* ISTR = 0 */

const static struct irq_pins irq_assign_table0[16]={

static const struct irq_pins irq_assign_table0[16]={

        {H8300_GPIO_P5,H8300_GPIO_B0},{H8300_GPIO_P5,H8300_GPIO_B1},

	{H8300_GPIO_P5,H8300_GPIO_B2},{H8300_GPIO_P5,H8300_GPIO_B3},

	{H8300_GPIO_P5,H8300_GPIO_B4},{H8300_GPIO_P5,H8300_GPIO_B5},
@@ -63,7 +63,7 @@ const static struct irq_pins irq_assign_table0[16]={ 
	{H8300_GPIO_PF,H8300_GPIO_B1},{H8300_GPIO_PF,H8300_GPIO_B2},

};

/* ISTR = 1 */

const static struct irq_pins irq_assign_table1[16]={

static const struct irq_pins irq_assign_table1[16]={

	{H8300_GPIO_P8,H8300_GPIO_B0},{H8300_GPIO_P8,H8300_GPIO_B1},

	{H8300_GPIO_P8,H8300_GPIO_B2},{H8300_GPIO_P8,H8300_GPIO_B3},

	{H8300_GPIO_P8,H8300_GPIO_B4},{H8300_GPIO_P8,H8300_GPIO_B5},

arch/h8300/platform/h8s/ints_h8s.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct irq_pins { 
	unsigned char bit_no;

} __attribute__((aligned(1),packed));

/* ISTR = 0 */

const static struct irq_pins irq_assign_table0[16]={

static const struct irq_pins irq_assign_table0[16]={

        {H8300_GPIO_P5,H8300_GPIO_B0},{H8300_GPIO_P5,H8300_GPIO_B1},

	{H8300_GPIO_P5,H8300_GPIO_B2},{H8300_GPIO_P5,H8300_GPIO_B3},

	{H8300_GPIO_P5,H8300_GPIO_B4},{H8300_GPIO_P5,H8300_GPIO_B5},
@@ -53,7 +53,7 @@ const static struct irq_pins irq_assign_table0[16]={ 
	{H8300_GPIO_PF,H8300_GPIO_B1},{H8300_GPIO_PF,H8300_GPIO_B2},

}; 

/* ISTR = 1 */

const static struct irq_pins irq_assign_table1[16]={

static const struct irq_pins irq_assign_table1[16]={

	{H8300_GPIO_P8,H8300_GPIO_B0},{H8300_GPIO_P8,H8300_GPIO_B1},

	{H8300_GPIO_P8,H8300_GPIO_B2},{H8300_GPIO_P8,H8300_GPIO_B3},

	{H8300_GPIO_P8,H8300_GPIO_B4},{H8300_GPIO_P8,H8300_GPIO_B5},