code.vuplus.com Git - vuplus_openembedded/blob - recipes/linux/linux-omap-2.6.28/0014-DSS-fix-clk_get_usecount.patch

   1 From ba234fff55f8a1ef96b57ce2e18ab90df76f2c82 Mon Sep 17 00:00:00 2001
   2 From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
   3 Date: Thu, 8 Jan 2009 12:01:39 +0200
   4 Subject: [PATCH] DSS: fix clk_get_usecount
   5
   6 ---
   7  arch/arm/plat-omap/dss/dss.c |   12 ++++++------
   8  1 files changed, 6 insertions(+), 6 deletions(-)
   9
  10 diff --git a/arch/arm/plat-omap/dss/dss.c b/arch/arm/plat-omap/dss/dss.c
  11 index 4a403c1..b9f35d8 100644
  12 --- a/arch/arm/plat-omap/dss/dss.c
  13 +++ b/arch/arm/plat-omap/dss/dss.c
  14 @@ -236,7 +236,7 @@ ssize_t dss_print_clocks(char *buf, ssize_t size)
  15                 l += snprintf(buf + l, size - l, "%-15s\t%lu\t%d\n",
  16                                 clocks[i]->name,
  17                                 clk_get_rate(clocks[i]),
  18 -                               clk_get_usecount(clocks[i]));
  19 +                               clocks[i]->usecount);
  20         }
  21
  22         return l;
  23 @@ -590,28 +590,28 @@ void dss_exit(void)
  24         free_irq(INT_24XX_DSS_IRQ, NULL);
  25
  26         /* these should be removed at some point */
  27 -       c = clk_get_usecount(dss.dss_ick);
  28 +       c = dss.dss_ick->usecount;
  29         if (c > 0) {
  30                 DSSERR("warning: dss_ick usecount %d, disabling\n", c);
  31                 while (c-- > 0)
  32                         clk_disable(dss.dss_ick);
  33         }
  34
  35 -       c = clk_get_usecount(dss.dss1_fck);
  36 +       c = dss.dss1_fck->usecount;
  37         if (c > 0) {
  38                 DSSERR("warning: dss1_fck usecount %d, disabling\n", c);
  39                 while (c-- > 0)
  40                         clk_disable(dss.dss1_fck);
  41         }
  42
  43 -       c = clk_get_usecount(dss.dss2_fck);
  44 +       c = dss.dss2_fck->usecount;
  45         if (c > 0) {
  46                 DSSERR("warning: dss2_fck usecount %d, disabling\n", c);
  47                 while (c-- > 0)
  48                         clk_disable(dss.dss2_fck);
  49         }
  50
  51 -       c = clk_get_usecount(dss.dss_54m_fck);
  52 +       c = dss.dss_54m_fck->usecount;
  53         if (c > 0) {
  54                 DSSERR("warning: dss_54m_fck usecount %d, disabling\n", c);
  55                 while (c-- > 0)
  56 @@ -619,7 +619,7 @@ void dss_exit(void)
  57         }
  58
  59         if (dss.dss_96m_fck) {
  60 -               c = clk_get_usecount(dss.dss_96m_fck);
  61 +               c = dss.dss_96m_fck->usecount;
  62                 if (c > 0) {
  63                         DSSERR("warning: dss_96m_fck usecount %d, disabling\n",
  64                                         c);
  65 --
  66 1.5.6.3
  67