From: <mar...@us...> - 2007-06-14 15:48:07
|
Revision: 1035 http://svn.sourceforge.net/hackndev/?rev=1035&view=rev Author: marex_z71 Date: 2007-06-14 08:47:55 -0700 (Thu, 14 Jun 2007) Log Message: ----------- PalmTE2, PalmTC: fix horrible coding style Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c 2007-06-13 15:59:41 UTC (rev 1034) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtc/palmtc.c 2007-06-14 15:47:55 UTC (rev 1035) @@ -98,9 +98,9 @@ } static struct pxamci_platform_data palmtc_mci_platform_data = { - .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, + .ocr_mask = (MMC_VDD_32_33 | MMC_VDD_33_34), .init = palmtc_mci_init, - /* .setpower = palmld_mci_setpower, */ +/* .setpower = palmld_mci_setpower, */ .exit = palmtc_mci_exit, }; @@ -108,11 +108,11 @@ /* Backlight ***/ static struct pxapwmbl_platform_data palmtc_backlight_data = { .pwm = 1, - .max_intensity = 0x100, //120 - .default_intensity = 0x50, //11a + .max_intensity = 0x100, + .default_intensity = 0x50, .limit_mask = 0x7F, - .prescaler = 1, // 7 - .period = 0x12B, // 16c + .prescaler = 1, + .period = 0x12B, }; @@ -126,9 +126,9 @@ }; static struct platform_device palmtc_backlight = { - .name = "pxapwm-bl", - .dev = { - .platform_data = &palmtc_backlight_data, + .name = "pxapwm-bl", + .dev = { + .platform_data = &palmtc_backlight_data, }, }; @@ -136,7 +136,9 @@ static struct platform_device palmtc_ac97_device = { .name = "pxa2xx-ac97", .id = -1, - .dev = { .platform_data = &palmtc_audio_ops }, + .dev = { + .platform_data = &palmtc_audio_ops + }, }; static struct platform_device palmtc_keyboard_device = { @@ -163,8 +165,8 @@ } MACHINE_START(OMAP_PALMTC, "Palm Tungsten C") - /* Maintainer: P3T3, Petr Blaha <p3...@ce...> */ -// .phys_ram = 0xa0000000, +/* Maintainer: P3T3, Petr Blaha <p3...@ce...> */ +/* .phys_ram = 0xa0000000, */ .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, @@ -173,4 +175,3 @@ .timer = &pxa_timer, .init_machine = palmtc_init MACHINE_END - Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-13 15:59:41 UTC (rev 1034) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmte2/palmte2.c 2007-06-14 15:47:55 UTC (rev 1035) @@ -48,7 +48,7 @@ static void palmte2_irda_configure (struct uart_pxa_port *up, int enable) { - //printk("irda_configure, %d\n", enable); + /* printk("irda_configure, %d\n", enable); */ /* Switch STUART RX/TX pins to SIR */ pxa_gpio_mode(GPIO_NR_PALMLD_STD_RXD_MD); @@ -92,8 +92,7 @@ new_stisr &= ~STISR_RCVEIR; if (new_stisr != old_stisr) { - while (!(STLSR & LSR_TEMT)) - ; + while (!(STLSR & LSR_TEMT)); STISR = new_stisr; } } @@ -101,22 +100,22 @@ static int palmte2_irda_get_txrx (struct uart_pxa_port *up) { - return ((STISR & STISR_XMITIR) ? PXA_SERIAL_TX : 0) | - ((STISR & STISR_RCVEIR) ? PXA_SERIAL_RX : 0); + return (((STISR & STISR_XMITIR) ? PXA_SERIAL_TX : 0) | + ((STISR & STISR_RCVEIR) ? PXA_SERIAL_RX : 0)); } static struct platform_pxa_serial_funcs palmte2_pxa_irda_funcs = { - .configure = palmte2_irda_configure, - .set_txrx = palmte2_irda_set_txrx, - .get_txrx = palmte2_irda_get_txrx, + .configure = palmte2_irda_configure, + .set_txrx = palmte2_irda_set_txrx, + .get_txrx = palmte2_irda_get_txrx, }; #endif struct platform_device palmte2_buttons = { - .name = "palmte2-buttons", - .id = -1, + .name = "palmte2-buttons", + .id = -1, }; /** @@ -135,7 +134,9 @@ static struct platform_device palmld_ac97 = { .name = "pxa2xx-ac97", .id = -1, - .dev = { .platform_data = &palmld_audio_ops }, + .dev = { + .platform_data = &palmld_audio_ops + }, }; @@ -153,10 +154,10 @@ }; static struct platform_device palmte2_backlight = { - .name = "pxapwm-bl", - .dev = { - .platform_data = &palmte2_backlight_data, - }, + .name = "pxapwm-bl", + .dev = { + .platform_data = &palmte2_backlight_data, + }, }; @@ -178,14 +179,14 @@ PWM_PERVAL0 = 0x16c; /* turn on PWMs */ CKEN |= CKEN0_PWM0 | CKEN1_PWM1; - } else { - /* turn off PWMs */ - CKEN &= ~(CKEN0_PWM0 | CKEN1_PWM1); - } + } else { + /* turn off PWMs */ + CKEN &= ~(CKEN0_PWM0 | CKEN1_PWM1); + } } static struct pxafb_mode_info palmte2_lcd_modes[] = { -{ + { .pixclock = 0, .xres = 320, .yres = 320, @@ -198,9 +199,7 @@ .upper_margin = 7, .lower_margin = 5, .sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, - -// .sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, -}, + }, }; static struct pxafb_mach_info palmte2_lcd_screen = { @@ -218,7 +217,7 @@ set_pxa_fb_info(&palmte2_lcd_screen); -// stuart_device.dev.platform_data = &palmte2_pxa_irda_funcs; +/* stuart_device.dev.platform_data = &palmte2_pxa_irda_funcs; */ platform_add_devices(devices, ARRAY_SIZE(devices)); /* @@ -228,8 +227,8 @@ } MACHINE_START(TUNGE2, "Palm Tungsten E2") - Maintainer: Carlos E. Medaglia Dyonisio <ca...@ne...> - //.phys_ram = 0xa0000000, +/* Maintainer: Carlos E. Medaglia Dyonisio <ca...@ne...> */ +/* .phys_ram = 0xa0000000, */ .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .map_io = pxa_map_io, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |