[ifxmips] many more code cleanups for checkpatch.pl, most flagged as errors

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13665 3c298f89-4303-0410-b956-a3cf2f4a3e73
2025-04-21 12:27:27 +03:00 · 2008-12-16 19:39:34 +00:00
parent 424b5aa79f
commit 73a104c025
22 changed files with 856 additions and 911 deletions
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/clock.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/clock.c
@@ -70,33 +70,31 @@ unsigned int ifxmips_clocks[] = {CLOCK_167M, CLOCK_133M, CLOCK_111M, CLOCK_83M }

 #define DDR_HZ ifxmips_clocks[ifxmips_r32(IFXMIPS_CGU_SYS) & 0x3]

-
-static inline unsigned int
-get_input_clock(int pll)
+static inline unsigned int get_input_clock(int pll)
 {
-	switch(pll)
-	{
+	switch (pll) {
 	case 0:
-		if(ifxmips_r32(IFXMIPS_CGU_PLL0_CFG) & CGU_PLL0_SRC)
+		if (ifxmips_r32(IFXMIPS_CGU_PLL0_CFG) & CGU_PLL0_SRC)
 			return BASIS_INPUT_CRYSTAL_USB;
-		else if(CGU_PLL0_PHASE_DIVIDER_ENABLE)
+		else if (CGU_PLL0_PHASE_DIVIDER_ENABLE)
 			return BASIC_INPUT_CLOCK_FREQUENCY_1;
 		else
 			return BASIC_INPUT_CLOCK_FREQUENCY_2;
 	case 1:
-		if(CGU_PLL1_SRC)
+		if (CGU_PLL1_SRC)
 			return BASIS_INPUT_CRYSTAL_USB;
-		else if(CGU_PLL0_PHASE_DIVIDER_ENABLE)
+		else if (CGU_PLL0_PHASE_DIVIDER_ENABLE)
 			return BASIC_INPUT_CLOCK_FREQUENCY_1;
 		else
 			return BASIC_INPUT_CLOCK_FREQUENCY_2;
 	case 2:
-		switch(CGU_PLL2_SRC)
-		{
+		switch (CGU_PLL2_SRC) {
 		case 0:
 			return cgu_get_pll0_fdiv();
 		case 1:
-			return CGU_PLL2_PHASE_DIVIDER_ENABLE ? BASIC_INPUT_CLOCK_FREQUENCY_1 : BASIC_INPUT_CLOCK_FREQUENCY_2;
+			return CGU_PLL2_PHASE_DIVIDER_ENABLE ?
+				BASIC_INPUT_CLOCK_FREQUENCY_1 :
+				BASIC_INPUT_CLOCK_FREQUENCY_2;
 		case 2:
 			return BASIS_INPUT_CRYSTAL_USB;
 		}
@@ -105,8 +103,7 @@ get_input_clock(int pll)
 	}
 }

-static inline unsigned int
-cal_dsm(int pll, unsigned int num, unsigned int den)
+static inline unsigned int cal_dsm(int pll, unsigned int num, unsigned int den)
 {
 	u64 res, clock = get_input_clock(pll);

@@ -115,8 +112,8 @@ cal_dsm(int pll, unsigned int num, unsigned int den)
 	return res;
 }

-static inline unsigned int
-mash_dsm(int pll, unsigned int M, unsigned int N, unsigned int K)
+static inline unsigned int mash_dsm(int pll, unsigned int M, unsigned int N,
+	unsigned int K)
 {
 	unsigned int num = ((N + 1) << 10) + K;
 	unsigned int den = (M + 1) << 10;
@@ -124,8 +121,8 @@ mash_dsm(int pll, unsigned int M, unsigned int N, unsigned int K)
 	return cal_dsm(pll, num, den);
 }

-static inline unsigned int
-ssff_dsm_1(int pll, unsigned int M,	unsigned int N, unsigned int K)
+static inline unsigned int ssff_dsm_1(int pll, unsigned int M, unsigned int N,
+	unsigned int K)
 {
 	unsigned int num = ((N + 1) << 11) + K + 512;
 	unsigned int den = (M + 1) << 11;
@@ -133,8 +130,8 @@ ssff_dsm_1(int pll, unsigned int M,	unsigned int N, unsigned int K)
 	return cal_dsm(pll, num, den);
 }

-static inline unsigned int
-ssff_dsm_2(int pll, unsigned int M,	unsigned int N, unsigned int K)
+static inline unsigned int ssff_dsm_2(int pll, unsigned int M, unsigned int N,
+	unsigned int K)
 {
 	unsigned int num = K >= 512 ?
 		((N + 1) << 12) + K - 512 : ((N + 1) << 12) + K + 3584;
@@ -143,22 +140,20 @@ ssff_dsm_2(int pll, unsigned int M,	unsigned int N, unsigned int K)
 	return cal_dsm(pll, num, den);
 }

-static inline unsigned int
-dsm(int pll, unsigned int M, unsigned int N, unsigned int K,
-	unsigned int dsmsel, unsigned int phase_div_en)
+static inline unsigned int dsm(int pll, unsigned int M, unsigned int N,
+	unsigned int K, unsigned int dsmsel, unsigned int phase_div_en)
 {
-	if(!dsmsel)
+	if (!dsmsel)
 		return mash_dsm(pll, M, N, K);
-	else if(!phase_div_en)
+	else if (!phase_div_en)
 		return mash_dsm(pll, M, N, K);
 	else
 		return ssff_dsm_2(pll, M, N, K);
 }

-static inline unsigned int
-cgu_get_pll0_fosc(void)
+static inline unsigned int cgu_get_pll0_fosc(void)
 {
-	if(CGU_PLL0_BYPASS)
+	if (CGU_PLL0_BYPASS)
 		return get_input_clock(0);
 	else
 		return !CGU_PLL0_CFG_FRAC_EN
@@ -168,19 +163,16 @@ cgu_get_pll0_fosc(void)
 				CGU_PLL0_CFG_DSMSEL, CGU_PLL0_PHASE_DIVIDER_ENABLE);
 }

-static unsigned int
-cgu_get_pll0_fdiv(void)
+static unsigned int cgu_get_pll0_fdiv(void)
 {
-	register unsigned int div = CGU_PLL2_CFG_INPUT_DIV + 1;
+	unsigned int div = CGU_PLL2_CFG_INPUT_DIV + 1;
 	return (cgu_get_pll0_fosc() + (div >> 1)) / div;
 }

-unsigned int
-cgu_get_io_region_clock(void)
+unsigned int cgu_get_io_region_clock(void)
 {
-	register unsigned int ret = cgu_get_pll0_fosc();
-	switch(ifxmips_r32(IFXMIPS_CGU_PLL2_CFG) & CGU_SYS_DDR_SEL)
-	{
+	unsigned int ret = cgu_get_pll0_fosc();
+	switch (ifxmips_r32(IFXMIPS_CGU_PLL2_CFG) & CGU_SYS_DDR_SEL) {
 	default:
 	case 0:
 		return (ret + 1) / 2;
@@ -193,36 +185,36 @@ cgu_get_io_region_clock(void)
 	}
 }

-unsigned int
-cgu_get_fpi_bus_clock(int fpi)
+unsigned int cgu_get_fpi_bus_clock(int fpi)
 {
-	register unsigned int ret = cgu_get_io_region_clock();
-	if((fpi == 2) && (ifxmips_r32(IFXMIPS_CGU_SYS) & CGU_SYS_FPI_SEL))
+	unsigned int ret = cgu_get_io_region_clock();
+	if ((fpi == 2) && (ifxmips_r32(IFXMIPS_CGU_SYS) & CGU_SYS_FPI_SEL))
 		ret >>= 1;
 	return ret;
 }

 void cgu_setup_pci_clk(int external_clock)
 {
-	//set clock to 33Mhz
-	ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) & ~0xf00000, IFXMIPS_CGU_IFCCR);
-	ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) | 0x800000, IFXMIPS_CGU_IFCCR);
-	if(external_clock)
-	{
-		ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) & ~ (1 << 16), IFXMIPS_CGU_IFCCR);
+	/* set clock to 33Mhz */
+	ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) & ~0xf00000,
+		IFXMIPS_CGU_IFCCR);
+	ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) | 0x800000,
+		IFXMIPS_CGU_IFCCR);
+	if (external_clock) 	{
+		ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) & ~(1 << 16),
+			IFXMIPS_CGU_IFCCR);
 		ifxmips_w32((1 << 30), IFXMIPS_CGU_PCICR);
 	} else {
-		ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) | (1 << 16), IFXMIPS_CGU_IFCCR);
+		ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) | (1 << 16),
+			IFXMIPS_CGU_IFCCR);
 		ifxmips_w32((1 << 31) | (1 << 30), IFXMIPS_CGU_PCICR);
 	}
 }

-unsigned int
-ifxmips_get_cpu_hz(void)
+unsigned int ifxmips_get_cpu_hz(void)
 {
 	unsigned int ddr_clock = DDR_HZ;
-	switch(ifxmips_r32(IFXMIPS_CGU_SYS) & 0xc)
-	{
+	switch (ifxmips_r32(IFXMIPS_CGU_SYS) & 0xc) {
 	case 0:
 		return CLOCK_333M;
 	case 4:
@@ -232,11 +224,10 @@ ifxmips_get_cpu_hz(void)
 }
 EXPORT_SYMBOL(ifxmips_get_cpu_hz);

-unsigned int
-ifxmips_get_fpi_hz(void)
+unsigned int ifxmips_get_fpi_hz(void)
 {
 	unsigned int ddr_clock = DDR_HZ;
-	if(ifxmips_r32(IFXMIPS_CGU_SYS) & 0x40)
+	if (ifxmips_r32(IFXMIPS_CGU_SYS) & 0x40)
 		return ddr_clock >> 1;
 	return ddr_clock;
 }
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/dma-core.c
@@ -37,13 +37,13 @@ extern void ifxmips_enable_irq(unsigned int irq_nr);
 extern void ifxmips_disable_irq(unsigned int irq_nr);

 u64 *g_desc_list;
-_dma_device_info dma_devs[MAX_DMA_DEVICE_NUM];
-_dma_channel_info dma_chan[MAX_DMA_CHANNEL_NUM];
+struct dma_device_info dma_devs[MAX_DMA_DEVICE_NUM];
+struct dma_channel_info dma_chan[MAX_DMA_CHANNEL_NUM];

 static const char *global_device_name[MAX_DMA_DEVICE_NUM] =
 	{ "PPE", "DEU", "SPI", "SDIO", "MCTRL0", "MCTRL1" };

-_dma_chan_map default_dma_map[MAX_DMA_CHANNEL_NUM] = {
+struct dma_chan_map default_dma_map[MAX_DMA_CHANNEL_NUM] = {
 	{"PPE", IFXMIPS_DMA_RX, 0, IFXMIPS_DMA_CH0_INT, 0},
 	{"PPE", IFXMIPS_DMA_TX, 0, IFXMIPS_DMA_CH1_INT, 0},
 	{"PPE", IFXMIPS_DMA_RX, 1, IFXMIPS_DMA_CH2_INT, 1},
@@ -66,7 +66,7 @@ _dma_chan_map default_dma_map[MAX_DMA_CHANNEL_NUM] = {
 	{"MCTRL1", IFXMIPS_DMA_TX, 1, IFXMIPS_DMA_CH19_INT, 1}
 };

-_dma_chan_map *chan_map = default_dma_map;
+struct dma_chan_map *chan_map = default_dma_map;
 volatile u32 g_ifxmips_dma_int_status;
 volatile int g_ifxmips_dma_in_process; /* 0=not in process, 1=in process */

@@ -87,7 +87,7 @@ void common_buffer_free(u8 *dataptr, void *opt)
 	kfree(dataptr);
 }

-void enable_ch_irq(_dma_channel_info *pCh)
+void enable_ch_irq(struct dma_channel_info *pCh)
 {
 	int chan_no = (int)(pCh - dma_chan);
 	unsigned long flag;
@@ -100,7 +100,7 @@ void enable_ch_irq(_dma_channel_info *pCh)
 	ifxmips_enable_irq(pCh->irq);
 }

-void disable_ch_irq(_dma_channel_info *pCh)
+void disable_ch_irq(struct dma_channel_info *pCh)
 {
 	unsigned long flag;
 	int chan_no = (int) (pCh - dma_chan);
@@ -114,7 +114,7 @@ void disable_ch_irq(_dma_channel_info *pCh)
 	ifxmips_mask_and_ack_irq(pCh->irq);
 }

-void open_chan(_dma_channel_info *pCh)
+void open_chan(struct dma_channel_info *pCh)
 {
 	unsigned long flag;
 	int chan_no = (int)(pCh - dma_chan);
@@ -127,7 +127,7 @@ void open_chan(_dma_channel_info *pCh)
 	local_irq_restore(flag);
 }

-void close_chan(_dma_channel_info *pCh)
+void close_chan(struct dma_channel_info *pCh)
 {
 	unsigned long flag;
 	int chan_no = (int) (pCh - dma_chan);
@@ -139,7 +139,7 @@ void close_chan(_dma_channel_info *pCh)
 	local_irq_restore(flag);
 }

-void reset_chan(_dma_channel_info *pCh)
+void reset_chan(struct dma_channel_info *pCh)
 {
 	int chan_no = (int) (pCh - dma_chan);

@@ -149,8 +149,8 @@ void reset_chan(_dma_channel_info *pCh)

 void rx_chan_intr_handler(int chan_no)
 {
-	_dma_device_info *pDev = (_dma_device_info *)dma_chan[chan_no].dma_dev;
-	_dma_channel_info *pCh = &dma_chan[chan_no];
+	struct dma_device_info *pDev = (struct dma_device_info *)dma_chan[chan_no].dma_dev;
+	struct dma_channel_info *pCh = &dma_chan[chan_no];
 	struct rx_desc *rx_desc_p;
 	int tmp;
 	unsigned long flag;
@@ -179,8 +179,8 @@ void rx_chan_intr_handler(int chan_no)

 inline void tx_chan_intr_handler(int chan_no)
 {
-	_dma_device_info *pDev = (_dma_device_info *)dma_chan[chan_no].dma_dev;
-	_dma_channel_info *pCh = &dma_chan[chan_no];
+	struct dma_device_info *pDev = (struct dma_device_info *)dma_chan[chan_no].dma_dev;
+	struct dma_channel_info *pCh = &dma_chan[chan_no];
 	int tmp;
 	unsigned long flag;

@@ -242,11 +242,11 @@ void do_dma_tasklet(unsigned long unused)

 irqreturn_t dma_interrupt(int irq, void *dev_id)
 {
-	_dma_channel_info *pCh;
+	struct dma_channel_info *pCh;
 	int chan_no = 0;
 	int tmp;

-	pCh = (_dma_channel_info *)dev_id;
+	pCh = (struct dma_channel_info *)dev_id;
 	chan_no = (int)(pCh - dma_chan);
 	if (chan_no < 0 || chan_no > 19)
 		BUG();
@@ -265,7 +265,7 @@ irqreturn_t dma_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }

-_dma_device_info *dma_device_reserve(char *dev_name)
+struct dma_device_info *dma_device_reserve(char *dev_name)
 {
 	int i;

@@ -282,21 +282,21 @@ _dma_device_info *dma_device_reserve(char *dev_name)
 }
 EXPORT_SYMBOL(dma_device_reserve);

-void dma_device_release(_dma_device_info *dev)
+void dma_device_release(struct dma_device_info *dev)
 {
 	dev->reserved = 0;
 }
 EXPORT_SYMBOL(dma_device_release);

-void dma_device_register(_dma_device_info *dev)
+void dma_device_register(struct dma_device_info *dev)
 {
 	int i, j;
 	int chan_no = 0;
 	u8 *buffer;
 	int byte_offset;
 	unsigned long flag;
-	_dma_device_info *pDev;
-	_dma_channel_info *pCh;
+	struct dma_device_info *pDev;
+	struct dma_channel_info *pCh;
 	struct rx_desc *rx_desc_p;
 	struct tx_desc *tx_desc_p;

@@ -331,7 +331,7 @@ void dma_device_register(_dma_device_info *dev)

 			for (j = 0; j < pCh->desc_len; j++) {
 				rx_desc_p = (struct rx_desc *)pCh->desc_base + j;
-				pDev = (_dma_device_info *)(pCh->dma_dev);
+				pDev = (struct dma_device_info *)(pCh->dma_dev);
 				buffer = pDev->buffer_alloc(pCh->packet_size, &byte_offset, (void *)&(pCh->opt[j]));
 				if (!buffer)
 					break;
@@ -364,11 +364,11 @@ void dma_device_register(_dma_device_info *dev)
 }
 EXPORT_SYMBOL(dma_device_register);

-void dma_device_unregister(_dma_device_info *dev)
+void dma_device_unregister(struct dma_device_info *dev)
 {
 	int i, j;
 	int chan_no;
-	_dma_channel_info *pCh;
+	struct dma_channel_info *pCh;
 	struct rx_desc *rx_desc_p;
 	struct tx_desc *tx_desc_p;
 	unsigned long flag;
@@ -442,7 +442,7 @@ int dma_device_read(struct dma_device_info *dma_dev, u8 **dataptr, void **opt)
 	int len;
 	int byte_offset = 0;
 	void *p = NULL;
-	_dma_channel_info *pCh = dma_dev->rx_chan[dma_dev->current_rx_chan];
+	struct dma_channel_info *pCh = dma_dev->rx_chan[dma_dev->current_rx_chan];
 	struct rx_desc *rx_desc_p;

 	/* get the rx data first */
@@ -488,13 +488,13 @@ int dma_device_write(struct dma_device_info *dma_dev, u8 *dataptr, int len, void
 {
 	unsigned long flag;
 	u32 tmp, byte_offset;
-	_dma_channel_info *pCh;
+	struct dma_channel_info *pCh;
 	int chan_no;
 	struct tx_desc *tx_desc_p;
 	local_irq_save(flag);

 	pCh = dma_dev->tx_chan[dma_dev->current_tx_chan];
-	chan_no = (int)(pCh - (_dma_channel_info *) dma_chan);
+	chan_no = (int)(pCh - (struct dma_channel_info *) dma_chan);

 	tx_desc_p = (struct tx_desc *)pCh->desc_base + pCh->prev_desc;
 	while (tx_desc_p->status.field.OWN == CPU_OWN && tx_desc_p->status.field.C) {
@@ -546,13 +546,13 @@ int dma_device_write(struct dma_device_info *dma_dev, u8 *dataptr, int len, void
 }
 EXPORT_SYMBOL(dma_device_write);

-int map_dma_chan(_dma_chan_map *map)
+int map_dma_chan(struct dma_chan_map *map)
 {
 	int i, j;
 	int result;

 	for (i = 0; i < MAX_DMA_DEVICE_NUM; i++)
-		strcpy(dma_devs[i].device_name, global_device_name[i]);
+		dma_devs[i].device_name = &global_device_name[i];

 	for (i = 0; i < MAX_DMA_CHANNEL_NUM; i++) {
 		dma_chan[i].irq = map[i].irq;
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
@@ -51,7 +51,7 @@ static struct timer_list rst_button_timer;
 extern struct sock *uevent_sock;
 extern u64 uevent_next_seqnum(void);
 static unsigned long seen;
-static int pressed = 0;
+static int pressed;

 struct event_t {
 	struct work_struct wq;
@@ -61,26 +61,24 @@ struct event_t {
 #endif

 #define IFXMIPS_GPIO_SANITY		{if (port > MAX_PORTS || pin > PINS_PER_PORT) return -EINVAL; }
-int
-ifxmips_port_reserve_pin(unsigned int port, unsigned int pin)
+
+int ifxmips_port_reserve_pin(unsigned int port, unsigned int pin)
 {
 	IFXMIPS_GPIO_SANITY;
-	printk("%s : call to obseleted function\n", __func__);
+	printk(KERN_INFO "%s : call to obseleted function\n", __func__);
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_reserve_pin);

-int
-ifxmips_port_free_pin(unsigned int port, unsigned int pin)
+int ifxmips_port_free_pin(unsigned int port, unsigned int pin)
 {
 	IFXMIPS_GPIO_SANITY;
-	printk("%s : call to obseleted function\n", __func__);
+	printk(KERN_INFO "%s : call to obseleted function\n", __func__);
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_free_pin);

-int
-ifxmips_port_set_open_drain(unsigned int port, unsigned int pin)
+int ifxmips_port_set_open_drain(unsigned int port, unsigned int pin)
 {
 	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) | (1 << pin),
@@ -89,8 +87,7 @@ ifxmips_port_set_open_drain(unsigned int port, unsigned int pin)
 }
 EXPORT_SYMBOL(ifxmips_port_set_open_drain);

-int
-ifxmips_port_clear_open_drain(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_open_drain(unsigned int port, unsigned int pin)
 {
 	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) & ~(1 << pin),
@@ -99,110 +96,99 @@ ifxmips_port_clear_open_drain(unsigned int port, unsigned int pin)
 }
 EXPORT_SYMBOL(ifxmips_port_clear_open_drain);

-int
-ifxmips_port_set_pudsel(unsigned int port, unsigned int pin)
+int ifxmips_port_set_pudsel(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) | (1 << pin),
 		IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_pudsel);

-int
-ifxmips_port_clear_pudsel (unsigned int port, unsigned int pin)
+int ifxmips_port_clear_pudsel(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) & ~(1 << pin),
 		IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_pudsel);

-int
-ifxmips_port_set_puden(unsigned int port, unsigned int pin)
+int ifxmips_port_set_puden(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) | (1 << pin),
 		IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_puden);

-int
-ifxmips_port_clear_puden(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_puden(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) & ~(1 << pin),
 		IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_puden);

-int
-ifxmips_port_set_stoff(unsigned int port, unsigned int pin)
+int ifxmips_port_set_stoff(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) | (1 << pin),
 		IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_stoff);

-int
-ifxmips_port_clear_stoff(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_stoff(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) & ~(1 << pin),
 		IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_stoff);

-int
-ifxmips_port_set_dir_out(unsigned int port, unsigned int pin)
+int ifxmips_port_set_dir_out(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) | (1 << pin),
 		IFXMIPS_GPIO_P0_DIR + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_dir_out);

-int
-ifxmips_port_set_dir_in(unsigned int port, unsigned int pin)
+int ifxmips_port_set_dir_in(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) & ~(1 << pin),
 		IFXMIPS_GPIO_P0_DIR + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_dir_in);

-int
-ifxmips_port_set_output(unsigned int port, unsigned int pin)
+int ifxmips_port_set_output(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) | (1 << pin),
 		IFXMIPS_GPIO_P0_OUT + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_output);

-int
-ifxmips_port_clear_output(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_output(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) & ~(1 << pin),
 		IFXMIPS_GPIO_P0_OUT + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_output);

-int
-ifxmips_port_get_input(unsigned int port, unsigned int pin)
+int ifxmips_port_get_input(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	if (ifxmips_r32(IFXMIPS_GPIO_P0_IN + (port * 0xC)) & (1 << pin))
 		return 0;
 	else
@@ -210,40 +196,36 @@ ifxmips_port_get_input(unsigned int port, unsigned int pin)
 }
 EXPORT_SYMBOL(ifxmips_port_get_input);

-int
-ifxmips_port_set_altsel0(unsigned int port, unsigned int pin)
+int ifxmips_port_set_altsel0(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) | (1 << pin),
 		IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_altsel0);

-int
-ifxmips_port_clear_altsel0(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_altsel0(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) & ~(1 << pin),
 		IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_clear_altsel0);

-int
-ifxmips_port_set_altsel1(unsigned int port, unsigned int pin)
+int ifxmips_port_set_altsel1(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) | (1 << pin),
 		IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
 	return 0;
 }
 EXPORT_SYMBOL(ifxmips_port_set_altsel1);

-int
-ifxmips_port_clear_altsel1(unsigned int port, unsigned int pin)
+int ifxmips_port_clear_altsel1(unsigned int port, unsigned int pin)
 {
-    IFXMIPS_GPIO_SANITY;
+	IFXMIPS_GPIO_SANITY;
 	ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) & ~(1 << pin),
 		IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
 	return 0;
@@ -251,16 +233,14 @@ ifxmips_port_clear_altsel1(unsigned int port, unsigned int pin)
 EXPORT_SYMBOL(ifxmips_port_clear_altsel1);

 #ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-static inline void
-add_msg(struct sk_buff *skb, char *msg)
+static inline void add_msg(struct sk_buff *skb, char *msg)
 {
 	char *scratch;
 	scratch = skb_put(skb, strlen(msg) + 1);
 	sprintf(scratch, msg);
 }

-static void
-hotplug_button(struct work_struct *wq)
+static void hotplug_button(struct work_struct *wq)
 {
 	struct sk_buff *skb;
 	struct event_t *event;
@@ -269,17 +249,17 @@ hotplug_button(struct work_struct *wq)
 	char buf[128];

 	event = container_of(wq, struct event_t, wq);
-	if(!uevent_sock)
+	if (!uevent_sock)
 		goto done;

 	s = event->set ? "pressed" : "released";
 	len = strlen(s) + 2;
 	skb = alloc_skb(len + 2048, GFP_KERNEL);
-	if(!skb)
+	if (!skb)
 		goto done;

 	scratch = skb_put(skb, len);
-	sprintf(scratch, "%s@",s);
+	sprintf(scratch, "%s@", s);
 	add_msg(skb, "HOME=/");
 	add_msg(skb, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
 	add_msg(skb, "SUBSYSTEM=button");
@@ -296,24 +276,21 @@ done:
 	kfree(event);
 }

-static void
-reset_button_poll(unsigned long unused)
+static void reset_button_poll(unsigned long unused)
 {
 	struct event_t *event;

 	rst_button_timer.expires = jiffies + (HZ / 4);
 	add_timer(&rst_button_timer);

-	if (pressed != ifxmips_port_get_input(rst_port, rst_pin))
-	{
-		if(pressed)
+	if (pressed != ifxmips_port_get_input(rst_port, rst_pin)) {
+		if (pressed)
 			pressed = 0;
 		else
 			pressed = 1;
-		event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
-		if (!event)
-		{
-			printk("Could not alloc hotplug event\n");
+		event = kzalloc(sizeof(struct event_t), GFP_ATOMIC);
+		if (!event) {
+			printk(KERN_INFO "Could not alloc hotplug event\n");
 			return;
 		}
 		event->set = pressed;
@@ -325,8 +302,7 @@ reset_button_poll(unsigned long unused)
 }
 #endif

-static int
-ifxmips_gpio_probe(struct platform_device *dev)
+static int ifxmips_gpio_probe(struct platform_device *dev)
 {
 	int retval = 0;

@@ -346,8 +322,7 @@ ifxmips_gpio_probe(struct platform_device *dev)
 	return retval;
 }

-static int
-ifxmips_gpio_remove(struct platform_device *pdev)
+static int ifxmips_gpio_remove(struct platform_device *pdev)
 {
 #ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
 	del_timer_sync(&rst_button_timer);
@@ -355,8 +330,7 @@ ifxmips_gpio_remove(struct platform_device *pdev)
 	return 0;
 }

-static struct
-platform_driver ifxmips_gpio_driver = {
+static struct platform_driver ifxmips_gpio_driver = {
 	.probe = ifxmips_gpio_probe,
 	.remove = ifxmips_gpio_remove,
 	.driver = {
@@ -365,8 +339,7 @@ platform_driver ifxmips_gpio_driver = {
 	},
 };

-int __init
-ifxmips_gpio_init(void)
+int __init ifxmips_gpio_init(void)
 {
 	int ret = platform_driver_register(&ifxmips_gpio_driver);
 	if (ret)
@@ -374,8 +347,7 @@ ifxmips_gpio_init(void)
 	return ret;
 }

-void __exit
-ifxmips_gpio_exit(void)
+void __exit ifxmips_gpio_exit(void)
 {
 	platform_driver_unregister(&ifxmips_gpio_driver);
 }
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c
@@ -13,7 +13,7 @@
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 *
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
 */

 #include <linux/kernel.h>
@@ -21,21 +21,21 @@
 #include <linux/version.h>
 #include <asm/ifxmips/ifxmips.h>

-void
-ifxmips_pmu_enable(unsigned int module)
+void ifxmips_pmu_enable(unsigned int module)
 {
 	int err = 1000000;

-	ifxmips_w32(ifxmips_r32(IFXMIPS_PMU_PWDCR) & ~module, IFXMIPS_PMU_PWDCR);
-	while (--err && (ifxmips_r32(IFXMIPS_PMU_PWDSR) & module)) {}
+	ifxmips_w32(ifxmips_r32(IFXMIPS_PMU_PWDCR) & ~module,
+		IFXMIPS_PMU_PWDCR);
+	while (--err && (ifxmips_r32(IFXMIPS_PMU_PWDSR) & module))
+		;

 	if (!err)
 		panic("activating PMU module failed!");
 }
 EXPORT_SYMBOL(ifxmips_pmu_enable);

-void
-ifxmips_pmu_disable(unsigned int module)
+void ifxmips_pmu_disable(unsigned int module)
 {
 	ifxmips_w32(ifxmips_r32(IFXMIPS_PMU_PWDCR) | module, IFXMIPS_PMU_PWDCR);
 }
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c
@@ -26,11 +26,11 @@
 static char buf[1024]; /* for prom_printf() */

 /* for voice cpu (MIPS24K) */
-unsigned int *prom_cp1_base = NULL;
-unsigned int prom_cp1_size = 0;
+unsigned int *prom_cp1_base;
+unsigned int prom_cp1_size;

 /* for Multithreading (APRP) on MIPS34K */
-unsigned long physical_memsize = 0L;
+unsigned long physical_memsize;

 #ifdef IFXMIPS_PROM_ASC0
 #define IFXMIPS_ASC_DIFF	0
@@ -57,7 +57,8 @@ void prom_putchar(char c)
 	unsigned long flags;

 	local_irq_save(flags);
-	while((asc_r32(IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF);
+	while ((asc_r32(IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF)
+		;

 	if (c == '\n')
 		asc_w32('\r', IFXMIPS_ASC_TBUF);
@@ -105,10 +106,9 @@ void __init prom_init(void)
 	mips_machtype = MACH_INFINEON_IFXMIPS;

 	if (argc) {
-		argv = (char**)KSEG1ADDR((unsigned long)argv);
+		argv = (char **)KSEG1ADDR((unsigned long)argv);
 		arcs_cmdline[0] = '\0';
-		for (i = 1; i < argc; i++)
-		{
+		for (i = 1; i < argc; i++) {
 			char *a = (char *)KSEG1ADDR(argv[i]);
 			if (!argv[i])
 				continue;
@@ -129,25 +129,22 @@ void __init prom_init(void)
 			strcpy(&(arcs_cmdline[0]),
 				"console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit");
 	}
-	envp = (char**)KSEG1ADDR((unsigned long)envp);
-	while(*envp)
-	{
+	envp = (char **)KSEG1ADDR((unsigned long)envp);
+	while (*envp) {
 		char *e = (char *)KSEG1ADDR(*envp);

-		if (!strncmp(e, "memsize=", 8))
-		{
+		if (!strncmp(e, "memsize=", 8)) {
 			e += 8;
 			memsize = simple_strtoul(e, NULL, 10);
 		}
 		envp++;
 	}
-
 	memsize *= 1024 * 1024;

 	/* only on Twinpass/Danube a second CPU is used for Voice */
 	if ((cpu_data[0].cputype == CPU_24K) && (prom_cp1_size)) {
 		memsize -= prom_cp1_size;
-		prom_cp1_base = (unsigned int*)KSEG1ADDR(memsize);
+		prom_cp1_base = (unsigned int *)KSEG1ADDR(memsize);

 		prom_printf("Using %dMB Ram and reserving %dMB for cp1\n",
 			memsize>>20, prom_cp1_size>>20);
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
@@ -13,14 +13,14 @@
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 *
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
 */

 #include <linux/kernel.h>
 #include <linux/pm.h>
-#include <asm/reboot.h>
+#include <linux/reboot.h>
+#include <linux/io.h>
 #include <asm/system.h>
-#include <asm/io.h>
 #include <asm/ifxmips/ifxmips.h>

 static void ifxmips_machine_restart(char *command)
@@ -28,22 +28,26 @@ static void ifxmips_machine_restart(char *command)
 	printk(KERN_NOTICE "System restart\n");
 	local_irq_disable();

-	ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_RST) | IFXMIPS_RCU_RST_ALL, IFXMIPS_RCU_RST);
-	for(;;);
+	ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_RST) | IFXMIPS_RCU_RST_ALL,
+		IFXMIPS_RCU_RST);
+	for (;;)
+		;
 }

 static void ifxmips_machine_halt(void)
 {
 	printk(KERN_NOTICE "System halted.\n");
 	local_irq_disable();
-	for(;;);
+	for (;;)
+		;
 }

 static void ifxmips_machine_power_off(void)
 {
-	printk (KERN_NOTICE "Please turn off the power now.\n");
+	printk(KERN_NOTICE "Please turn off the power now.\n");
 	local_irq_disable();
-	for(;;);
+	for (;;)
+		;
 }

 void ifxmips_reboot_setup(void)
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/setup.c
@@ -19,11 +19,13 @@

 #include <linux/init.h>

-#include <asm/time.h>
-#include <asm/traps.h>
+#include <linux/time.h>
 #include <linux/cpu.h>
+
+#include <asm/traps.h>
 #include <asm/irq.h>
 #include <asm/bootinfo.h>
+
 #include <asm/ifxmips/ifxmips.h>
 #include <asm/ifxmips/ifxmips_irq.h>
 #include <asm/ifxmips/ifxmips_pmu.h>
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/timer.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/timer.c