]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Docs: blackfin: Use new switch macro SAMPLE_IRQ_TIMER instead of IRQ_TIMER5
authorChen Gang <xili_gchen_5257@hotmail.com>
Sun, 5 Apr 2015 04:25:44 +0000 (12:25 +0800)
committerJonathan Corbet <corbet@lwn.net>
Thu, 7 May 2015 15:35:14 +0000 (09:35 -0600)
Not all blackfin machines support IRQ_TIMER5, but all machines support
IRQ_TIMER2. So add a switch macro for them. The related error:

  Documentation/blackfin/gptimers-example.c: In function 'gptimer_example_init':
  Documentation/blackfin/gptimers-example.c:60:20: error: 'IRQ_TIMER5' undeclared (first use in this function)
    ret = request_irq(IRQ_TIMER5, gptimer_example_irq, IRQF_SHARED, DRIVER_NAME, &data);
                      ^
  Documentation/blackfin/gptimers-example.c:60:20: note: each undeclared identifier is reported only once for each function it appears in
  Documentation/blackfin/gptimers-example.c: In function 'gptimer_example_exit':
  Documentation/blackfin/gptimers-example.c:78:11: error: 'IRQ_TIMER5' undeclared (first use in this function)
    free_irq(IRQ_TIMER5, &data);
             ^

Also notice about 80 columns limitation.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Documentation/blackfin/gptimers-example.c

index b1bd6340e748e2a612b0d088fb252e7bffe23d03..283eba993d9d62115db668c3fa67ced228a047ac 100644 (file)
 
 #define DRIVER_NAME "gptimer_example"
 
+#ifdef IRQ_TIMER5
+#define SAMPLE_IRQ_TIMER IRQ_TIMER5
+#else
+#define SAMPLE_IRQ_TIMER IRQ_TIMER2
+#endif
+
 struct gptimer_data {
        uint32_t period, width;
 };
@@ -57,7 +63,8 @@ static int __init gptimer_example_init(void)
        }
 
        /* grab the IRQ for the timer */
-       ret = request_irq(IRQ_TIMER5, gptimer_example_irq, IRQF_SHARED, DRIVER_NAME, &data);
+       ret = request_irq(SAMPLE_IRQ_TIMER, gptimer_example_irq,
+                       IRQF_SHARED, DRIVER_NAME, &data);
        if (ret) {
                printk(KERN_NOTICE DRIVER_NAME ": IRQ request failed\n");
                peripheral_free(P_TMR5);
@@ -65,7 +72,8 @@ static int __init gptimer_example_init(void)
        }
 
        /* setup the timer and enable it */
-       set_gptimer_config(TIMER5_id, WDTH_CAP | PULSE_HI | PERIOD_CNT | IRQ_ENA);
+       set_gptimer_config(TIMER5_id,
+                       WDTH_CAP | PULSE_HI | PERIOD_CNT | IRQ_ENA);
        enable_gptimers(TIMER5bit);
 
        return 0;
@@ -75,7 +83,7 @@ module_init(gptimer_example_init);
 static void __exit gptimer_example_exit(void)
 {
        disable_gptimers(TIMER5bit);
-       free_irq(IRQ_TIMER5, &data);
+       free_irq(SAMPLE_IRQ_TIMER, &data);
        peripheral_free(P_TMR5);
 }
 module_exit(gptimer_example_exit);