Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 9853848860d7ece7d84ac43cfde5390b2638eb89

Authored by Uwe Kleine-König
1 parent 24920a79a2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mach-netx/time.c: codingstyle cleanup 

To prevent cluttering the next patches with noop noise, do the cleanup
in this separate patch:

 - use tab to indent
 - break comments before column 80

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Showing 1 changed file with 14 additions and 12 deletions Side-by-side Diff

arch/arm/mach-netx/time.c
Diff comments   View file @ 9853848
... ... @@ -42,9 +42,9 @@
42 42 }
43 43  
44 44 static struct irqaction netx_timer_irq = {
45   - .name = "NetX Timer Tick",
46   - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
47   - .handler = netx_timer_interrupt,
  45 + .name = "NetX Timer Tick",
  46 + .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
  47 + .handler = netx_timer_interrupt,
48 48 };
49 49  
50 50 cycle_t netx_get_cycles(void)
51 51  
... ... @@ -53,11 +53,11 @@
53 53 }
54 54  
55 55 static struct clocksource clocksource_netx = {
56   - .name = "netx_timer",
  56 + .name = "netx_timer",
57 57 .rating = 200,
58 58 .read = netx_get_cycles,
59 59 .mask = CLOCKSOURCE_MASK(32),
60   - .shift = 20,
  60 + .shift = 20,
61 61 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
62 62 };
63 63  
64 64  
65 65  
66 66  
... ... @@ -77,20 +77,22 @@
77 77 /* acknowledge interrupt */
78 78 writel(COUNTER_BIT(0), NETX_GPIO_IRQ);
79 79  
80   - /* Enable the interrupt in the specific timer register and start timer */
  80 + /* Enable the interrupt in the specific timer
  81 + * register and start timer
  82 + */
81 83 writel(COUNTER_BIT(0), NETX_GPIO_IRQ_ENABLE);
82 84 writel(NETX_GPIO_COUNTER_CTRL_IRQ_EN | NETX_GPIO_COUNTER_CTRL_RUN,
83   - NETX_GPIO_COUNTER_CTRL(0));
  85 + NETX_GPIO_COUNTER_CTRL(0));
84 86  
85 87 setup_irq(NETX_IRQ_TIMER0, &netx_timer_irq);
86 88  
87 89 /* Setup timer one for clocksource */
88   - writel(0, NETX_GPIO_COUNTER_CTRL(1));
89   - writel(0, NETX_GPIO_COUNTER_CURRENT(1));
90   - writel(0xFFFFFFFF, NETX_GPIO_COUNTER_MAX(1));
  90 + writel(0, NETX_GPIO_COUNTER_CTRL(1));
  91 + writel(0, NETX_GPIO_COUNTER_CURRENT(1));
  92 + writel(0xffffffff, NETX_GPIO_COUNTER_MAX(1));
91 93  
92   - writel(NETX_GPIO_COUNTER_CTRL_RUN,
93   - NETX_GPIO_COUNTER_CTRL(1));
  94 + writel(NETX_GPIO_COUNTER_CTRL_RUN,
  95 + NETX_GPIO_COUNTER_CTRL(1));
94 96  
95 97 clocksource_netx.mult =
96 98 clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_netx.shift);