rt-patches/0261-clocksource-atmel-compile-fixes.patch

   1 From 06a5d31199ba4b992bcd46651850f3b82284388f Mon Sep 17 00:00:00 2001
   2 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
   3 Date: Wed, 13 Jan 2016 17:54:36 +0100
   4 Subject: [PATCH 261/366] clocksource: atmel: compile fixes
   5
   6 Reported-by: kernel test robot <ying.huang@linux.intel.com>
   7 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
   8 ---
   9  drivers/clocksource/timer-atmel-pit.c | 4 ++--
  10  drivers/clocksource/timer-atmel-st.c  | 6 +++---
  11  2 files changed, 5 insertions(+), 5 deletions(-)
  12
  13 diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
  14 index 80d74c4..a7abdb6 100644
  15 --- a/drivers/clocksource/timer-atmel-pit.c
  16 +++ b/drivers/clocksource/timer-atmel-pit.c
  17 @@ -96,10 +96,11 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev)
  18
  19         /* disable irq, leaving the clocksource active */
  20         pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
  21 -       free_irq(atmel_pit_irq, data);
  22 +       free_irq(data->irq, data);
  23         return 0;
  24  }
  25
  26 +static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id);
  27  /*
  28   * Clockevent device:  interrupts every 1/HZ (== pit_cycles * MCK/16)
  29   */
  30 @@ -189,7 +190,6 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data)
  31  {
  32         unsigned long   pit_rate;
  33         unsigned        bits;
  34 -       int             ret;
  35
  36         /*
  37          * Use our actual MCK to figure out how many MCK/16 ticks per
  38 diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c
  39 index ea37afc..103d0fd 100644
  40 --- a/drivers/clocksource/timer-atmel-st.c
  41 +++ b/drivers/clocksource/timer-atmel-st.c
  42 @@ -150,7 +150,7 @@ static int clkevt32k_set_oneshot(struct clock_event_device *dev)
  43
  44  static int clkevt32k_set_periodic(struct clock_event_device *dev)
  45  {
  46 -       int irq;
  47 +       int ret;
  48
  49         clkdev32k_disable_and_flush_irq();
  50
  51 @@ -229,8 +229,8 @@ static void __init atmel_st_timer_init(struct device_node *node)
  52         regmap_read(regmap_st, AT91_ST_SR, &val);
  53
  54         /* Get the interrupts property */
  55 -       irq  = irq_of_parse_and_map(node, 0);
  56 -       if (!irq)
  57 +       atmel_st_irq  = irq_of_parse_and_map(node, 0);
  58 +       if (!atmel_st_irq)
  59                 panic(pr_fmt("Unable to get IRQ from DT\n"));
  60
  61         sclk = of_clk_get(node, 0);
  62 --
  63 1.9.1
  64