ARM: OMAP1: Change the comments to C style

Change the comments to C style

Signed-off-by: David Cohen <david.cohen@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index c73ca61e585ef6f49385e8fc377a7a6974e12082..6aac72dc430613a1988346bd72383bb7a077fe41 100644 (file)
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -135,21 +135,21 @@ static void __init ams_delta_init_irq(void)
 }
 
 static struct map_desc ams_delta_io_desc[] __initdata = {
-       // AMS_DELTA_LATCH1
+       /* AMS_DELTA_LATCH1 */
        {
                .virtual        = AMS_DELTA_LATCH1_VIRT,
                .pfn            = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS),
                .length         = 0x01000000,
                .type           = MT_DEVICE
        },
-       // AMS_DELTA_LATCH2
+       /* AMS_DELTA_LATCH2 */
        {
                .virtual        = AMS_DELTA_LATCH2_VIRT,
                .pfn            = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS),
                .length         = 0x01000000,
                .type           = MT_DEVICE
        },
-       // AMS_DELTA_MODEM
+       /* AMS_DELTA_MODEM */
        {
                .virtual        = AMS_DELTA_MODEM_VIRT,
                .pfn            = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 1a69002e3f8040757e9c4cb6ab58f1f9f2443819..18899d74d4c071253242958fd015f90451372647 100644 (file)
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -309,18 +309,18 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
        .srgr2 = GSYNC | CLKSP | FSGM | FPER(31),
 
        .pcr0  = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP,
-       //.pcr0 = CLKXP | CLKRP,        /* mcbsp: slave */
+       /*.pcr0 = CLKXP | CLKRP,*/        /* mcbsp: slave */
 };
 
 static struct omap_alsa_codec_config alsa_config = {
        .name                   = "H2 TSC2101",
        .mcbsp_regs_alsa        = &mcbsp_regs,
-       .codec_configure_dev    = NULL, // tsc2101_configure,
-       .codec_set_samplerate   = NULL, // tsc2101_set_samplerate,
-       .codec_clock_setup      = NULL, // tsc2101_clock_setup,
-       .codec_clock_on         = NULL, // tsc2101_clock_on,
-       .codec_clock_off        = NULL, // tsc2101_clock_off,
-       .get_default_samplerate = NULL, // tsc2101_get_default_samplerate,
+       .codec_configure_dev    = NULL, /* tsc2101_configure, */
+       .codec_set_samplerate   = NULL, /* tsc2101_set_samplerate, */
+       .codec_clock_setup      = NULL, /* tsc2101_clock_setup, */
+       .codec_clock_on         = NULL, /* tsc2101_clock_on, */
+       .codec_clock_off        = NULL, /* tsc2101_clock_off, */
+       .get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */
 };
 
 static struct platform_device h2_mcbsp1_device = {
@@ -378,11 +378,11 @@ static struct omap_usb_config h2_usb_config __initdata = {
        .otg            = 2,
 
 #ifdef CONFIG_USB_GADGET_OMAP
-       .hmc_mode       = 19,   // 0:host(off) 1:dev|otg 2:disabled
-       // .hmc_mode    = 21,   // 0:host(off) 1:dev(loopback) 2:host(loopback)
+       .hmc_mode       = 19,   /* 0:host(off) 1:dev|otg 2:disabled */
+       /* .hmc_mode    = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 #elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
        /* needs OTG cable, or NONSTANDARD (B-to-MiniB) */
-       .hmc_mode       = 20,   // 1:dev|otg(off) 1:host 2:disabled
+       .hmc_mode       = 20,   /* 1:dev|otg(off) 1:host 2:disabled */
 #endif
 
        .pins[1]        = 3,
@@ -443,7 +443,7 @@ static void __init h2_init(void)
        omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
 
        /* MMC:  card detect and WP */
-       // omap_cfg_reg(U19_ARMIO1);            /* CD */
+       /* omap_cfg_reg(U19_ARMIO1); */         /* CD */
        omap_cfg_reg(BALLOUT_V8_ARMIO3);        /* WP */
 
        /* Irda */

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index c4a7141bb78c3b0337eb16c94fb143c3210a6974..67ae5035a7efa9c029d89f31378bf22b545be09b 100644 (file)
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -388,18 +388,18 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
        .srgr2 = GSYNC | CLKSP | FSGM | FPER(31),
 
        .pcr0  = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP,
-       //.pcr0 = CLKXP | CLKRP,        /* mcbsp: slave */
+       /*.pcr0 = CLKXP | CLKRP,*/        /* mcbsp: slave */
 };
 
 static struct omap_alsa_codec_config alsa_config = {
        .name                   = "H3 TSC2101",
        .mcbsp_regs_alsa        = &mcbsp_regs,
-       .codec_configure_dev    = NULL, // tsc2101_configure,
-       .codec_set_samplerate   = NULL, // tsc2101_set_samplerate,
-       .codec_clock_setup      = NULL, // tsc2101_clock_setup,
-       .codec_clock_on         = NULL, // tsc2101_clock_on,
-       .codec_clock_off        = NULL, // tsc2101_clock_off,
-       .get_default_samplerate = NULL, // tsc2101_get_default_samplerate,
+       .codec_configure_dev    = NULL, /* tsc2101_configure, */
+       .codec_set_samplerate   = NULL, /* tsc2101_set_samplerate, */
+       .codec_clock_setup      = NULL, /* tsc2101_clock_setup, */
+       .codec_clock_on         = NULL, /* tsc2101_clock_on, */
+       .codec_clock_off        = NULL, /* tsc2101_clock_off, */
+       .get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */
 };
 
 static struct platform_device h3_mcbsp1_device = {

diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 7d2d8af155a340ffc1c77ee67fbeb086a69ca90a..92c14d364b5126690028fd129ab62ae7702b4363 100644 (file)
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -134,12 +134,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
 static struct omap_alsa_codec_config alsa_config = {
        .name                   = "OMAP Innovator AIC23",
        .mcbsp_regs_alsa        = &mcbsp_regs,
-       .codec_configure_dev    = NULL, // aic23_configure,
-       .codec_set_samplerate   = NULL, // aic23_set_samplerate,
-       .codec_clock_setup      = NULL, // aic23_clock_setup,
-       .codec_clock_on         = NULL, // aic23_clock_on,
-       .codec_clock_off        = NULL, // aic23_clock_off,
-       .get_default_samplerate = NULL, // aic23_get_default_samplerate,
+       .codec_configure_dev    = NULL, /* aic23_configure, */
+       .codec_set_samplerate   = NULL, /* aic23_set_samplerate, */
+       .codec_clock_setup      = NULL, /* aic23_clock_setup, */
+       .codec_clock_on         = NULL, /* aic23_clock_on, */
+       .codec_clock_off        = NULL, /* aic23_clock_off, */
+       .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
 };
 
 static struct platform_device innovator_mcbsp1_device = {
@@ -345,11 +345,11 @@ static struct omap_usb_config h2_usb_config __initdata = {
        .otg            = 2,
 
 #ifdef CONFIG_USB_GADGET_OMAP
-       .hmc_mode       = 19,   // 0:host(off) 1:dev|otg 2:disabled
-       // .hmc_mode    = 21,   // 0:host(off) 1:dev(loopback) 2:host(loopback)
+       .hmc_mode       = 19,   /* 0:host(off) 1:dev|otg 2:disabled */
+       /* .hmc_mode    = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 #elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
        /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
-       .hmc_mode       = 20,   // 1:dev|otg(off) 1:host 2:disabled
+       .hmc_mode       = 20,   /* 1:dev|otg(off) 1:host 2:disabled */
 #endif
 
        .pins[1]        = 3,

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 84333440008c416d7f840a22870ae59b531b695d..e1f813d4417db9337eb476a1c4aec3213a1d0928 100644 (file)
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -160,12 +160,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
 static struct omap_alsa_codec_config alsa_config = {
        .name                   = "OSK AIC23",
        .mcbsp_regs_alsa        = &mcbsp_regs,
-       .codec_configure_dev    = NULL, // aic23_configure,
-       .codec_set_samplerate   = NULL, // aic23_set_samplerate,
-       .codec_clock_setup      = NULL, // aic23_clock_setup,
-       .codec_clock_on         = NULL, // aic23_clock_on,
-       .codec_clock_off        = NULL, // aic23_clock_off,
-       .get_default_samplerate = NULL, // aic23_get_default_samplerate,
+       .codec_configure_dev    = NULL, /* aic23_configure, */
+       .codec_set_samplerate   = NULL, /* aic23_set_samplerate, */
+       .codec_clock_setup      = NULL, /* aic23_clock_setup, */
+       .codec_clock_on         = NULL, /* aic23_clock_on, */
+       .codec_clock_off        = NULL, /* aic23_clock_off, */
+       .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
 };
 
 static struct platform_device osk5912_mcbsp1_device = {
@@ -392,7 +392,7 @@ static void __init osk_mistral_init(void)
        omap_cfg_reg(W13_1610_CCP_CLKM);
        omap_cfg_reg(Y12_1610_CCP_CLKP);
        /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */
-       // omap_cfg_reg(Y14_1610_CCP_DATAM);
+       /* omap_cfg_reg(Y14_1610_CCP_DATAM); */
        omap_cfg_reg(W14_1610_CCP_DATAP);
 
        /* CAM_PWDN */
@@ -404,8 +404,8 @@ static void __init osk_mistral_init(void)
                pr_debug("OSK+Mistral: CAM_PWDN is awol\n");
 
 
-       // omap_cfg_reg(P19_1610_GPIO6);        // BUSY
-       omap_cfg_reg(P20_1610_GPIO4);   // PENIRQ
+       /* omap_cfg_reg(P19_1610_GPIO6); */     /* BUSY */
+       omap_cfg_reg(P20_1610_GPIO4);   /* PENIRQ */
        set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);
        spi_register_board_info(mistral_boardinfo,
                        ARRAY_SIZE(mistral_boardinfo));

diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index ed7094a70064c2c0b50b04b204a2b76f8a0be38e..772daed493c195dde978b92ce8bf1b5350b40bfc 100644 (file)
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -144,12 +144,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
 static struct omap_alsa_codec_config alsa_config = {
        .name                   = "PalmTT AIC23",
        .mcbsp_regs_alsa        = &mcbsp_regs,
-       .codec_configure_dev    = NULL, // aic23_configure,
-       .codec_set_samplerate   = NULL, // aic23_set_samplerate,
-       .codec_clock_setup      = NULL, // aic23_clock_setup,
-       .codec_clock_on         = NULL, // aic23_clock_on,
-       .codec_clock_off        = NULL, // aic23_clock_off,
-       .get_default_samplerate = NULL, // aic23_get_default_samplerate,
+       .codec_configure_dev    = NULL, /* aic23_configure, */
+       .codec_set_samplerate   = NULL, /* aic23_set_samplerate, */
+       .codec_clock_setup      = NULL, /* aic23_clock_setup, */
+       .codec_clock_on         = NULL, /* aic23_clock_on, */
+       .codec_clock_off        = NULL, /* aic23_clock_off, */
+       .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
 };
 
 static struct platform_device palmtt_mcbsp1_device = {

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 5d9faa68d2ecdb7eb5c32b1915ec4b02120a374e..4ea2933f887d1e12485354b8b042663ae6238420 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -1,4 +1,3 @@
-//kernel/linux-omap-fsample/arch/arm/mach-omap1/clock.c#2 - edit change 3808 (text)
 /*
  *  linux/arch/arm/mach-omap1/clock.c
  *
@@ -650,9 +649,9 @@ static void __init omap1_clk_disable_unused(struct clk *clk)
 
        /* FIXME: This clock seems to be necessary but no-one
         * has asked for its activation. */
-       if (clk == &tc2_ck              // FIX: pm.c (SRAM), CCP, Camera
-           || clk == &ck_dpll1out.clk  // FIX: SoSSI, SSR
-           || clk == &arm_gpio_ck      // FIX: GPIO code for 1510
+       if (clk == &tc2_ck              /* FIX: pm.c (SRAM), CCP, Camera */
+           || clk == &ck_dpll1out.clk  /* FIX: SoSSI, SSR */
+           || clk == &arm_gpio_ck      /* FIX: GPIO code for 1510 */
                ) {
                printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n",
                       clk->name);

diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 6939d5e7569af99db03c2659e0796787cca3c689..026685ed461aab5b3c2c7864aa47f83eff40db4f 100644 (file)
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -82,7 +82,7 @@ static void mistral_setled(void)
                red = 1;
        else if (hw_led_state & IDLE_LED)
                green = 1;
-       // else both sides are disabled
+       /* else both sides are disabled */
 
        omap_set_gpio_dataout(GPIO_LED_GREEN, green);
        omap_set_gpio_dataout(GPIO_LED_RED, red);
@@ -112,7 +112,7 @@ void osk_leds_event(led_event_t evt)
        case led_stop:
                led_state &= ~LED_STATE_ENABLED;
                hw_led_state = 0;
-               // NOTE:  work may still be pending!!
+               /* NOTE:  work may still be pending!! */
                break;
 
        case led_claim: