target/linux/s3c24xx/patches-2.6.26/1217-debug-move-dev-info-to-dbg.patch.patch

   1 From 6901f097adc3fce4e34861a1634915fe56344c55 Mon Sep 17 00:00:00 2001
   2 From: Andy Green <andy@openmoko.com>
   3 Date: Fri, 25 Jul 2008 23:06:20 +0100
   4 Subject: [PATCH] debug-move-dev-info-to-dbg.patch
   5  Suggested-by: Sean McNeil <sean@mcneil.com>
   6
   7 To see if some subtle race is involved, Sean has tried
   8 removing syslog traffic during resume and found he was
   9 not seeing the resume crash any more.  We're giving it
  10 a try to see if it changes the behaviour for anyone
  11 else.  It would mean we have a pretty fine race in there
  12 somewhere.
  13
  14 Signed-off-by: Andy Green <andy@openmoko.com>
  15 ---
  16  arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    4 ++--
  17  drivers/i2c/chips/pcf50633.c           |   28 ++++++++++++++--------------
  18  2 files changed, 16 insertions(+), 16 deletions(-)
  19
  20 diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
  21 index dc27aea..de83939 100644
  22 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
  23 +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
  24 @@ -95,7 +95,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
  25         if (!strcmp(attr->attr.name, "power_on")) {
  26                 if (on) {
  27                         if (gta01_gsm.con) {
  28 -                               dev_info(dev, "powering up GSM, thus "
  29 +                               dev_dbg(dev, "powering up GSM, thus "
  30                                          "disconnecting serial console\n");
  31
  32                                 console_stop(gta01_gsm.con);
  33 @@ -140,7 +140,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
  34                         if (gta01_gsm.con) {
  35                                 console_start(gta01_gsm.con);
  36
  37 -                               dev_info(dev, "powered down GSM, thus enabling "
  38 +                               dev_dbg(dev, "powered down GSM, thus enabling "
  39                                          "serial console\n");
  40                         }
  41                 }
  42 diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
  43 index fea2f38..4c73a9d 100644
  44 --- a/drivers/i2c/chips/pcf50633.c
  45 +++ b/drivers/i2c/chips/pcf50633.c
  46 @@ -580,7 +580,7 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
  47                  * stop GPO / EN_HOSTUSB power driving out on the same
  48                  * USB power pins we have a 1A charger on right now!
  49                  */
  50 -               dev_info(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
  51 +               dev_dbg(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
  52                 __reg_write(pcf, PCF50633_GPO - PCF50633_GPIO1 +
  53                                  PCF50633_REG_GPIO1CFG,
  54                                  __reg_read(pcf, PCF50633_GPO - PCF50633_GPIO1 +
  55 @@ -636,7 +636,7 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
  56             (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND))
  57                 goto bail;
  58
  59 -       dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
  60 +       dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
  61
  62         if (!pcf->probe_completed)
  63                 goto reschedule;
  64 @@ -656,7 +656,7 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
  65
  66         /* OK let's set the requested limit and finish */
  67
  68 -       dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
  69 +       dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
  70                                                          pcf->pending_curlimit);
  71         pcf50633_usb_curlim_set(pcf, pcf->pending_curlimit);
  72
  73 @@ -665,7 +665,7 @@ bail:
  74         return;
  75
  76  reschedule:
  77 -       dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
  78 +       dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
  79         if (!schedule_work(&pcf->work_usb_curlimit))
  80                 dev_err(&pcf->client.dev, "curlim reschedule work "
  81                                                             "already queued\n");
  82 @@ -694,7 +694,7 @@ int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
  83                 return -EBUSY;
  84         }
  85
  86 -       dev_info(&pcf->client.dev,
  87 +       dev_dbg(&pcf->client.dev,
  88                  "pcf50633_notify_usb_current_limit_change %dmA\n", ma);
  89
  90         /* prepare to detect USB power removal before we complete */
  91 @@ -1213,7 +1213,7 @@ reschedule:
  92         if ((pcf->suspend_state != PCF50633_SS_STARTING_SUSPEND) &&
  93             (pcf->suspend_state != PCF50633_SS_COMPLETED_SUSPEND)) {
  94                 msleep(10);
  95 -               dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
  96 +               dev_dbg(&pcf->client.dev, "rescheduling interrupt service\n");
  97         }
  98         if (!schedule_work(&pcf->work))
  99                 dev_err(&pcf->client.dev, "int service reschedule failed\n");
 100 @@ -1227,7 +1227,7 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
 101         struct pcf50633_data *pcf = _pcf;
 102
 103         DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
 104 -       dev_info(&pcf->client.dev, "pcf50633_irq scheduling work\n");
 105 +       dev_dbg(&pcf->client.dev, "pcf50633_irq scheduling work\n");
 106
 107         get_device(&pcf->client.dev);
 108         if (!schedule_work(&pcf->work) && !pcf->working)
 109 @@ -1739,7 +1739,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
 110
 111         mutex_unlock(&pcf->lock);
 112
 113 -       dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 114 +       dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 115                 pcf_tm.time[PCF50633_TI_DAY],
 116                 pcf_tm.time[PCF50633_TI_MONTH],
 117                 pcf_tm.time[PCF50633_TI_YEAR],
 118 @@ -1749,7 +1749,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
 119
 120         pcf2rtc_time(tm, &pcf_tm);
 121
 122 -       dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
 123 +       dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
 124                 tm->tm_mday, tm->tm_mon, tm->tm_year,
 125                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 126
 127 @@ -1763,11 +1763,11 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
 128         struct pcf50633_time pcf_tm;
 129         int ret;
 130
 131 -       dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
 132 +       dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
 133                 tm->tm_mday, tm->tm_mon, tm->tm_year,
 134                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 135         rtc2pcf_time(&pcf_tm, tm);
 136 -       dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 137 +       dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 138                 pcf_tm.time[PCF50633_TI_DAY],
 139                 pcf_tm.time[PCF50633_TI_MONTH],
 140                 pcf_tm.time[PCF50633_TI_YEAR],
 141 @@ -2430,7 +2430,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
 142                 else
 143                         tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
 144
 145 -               dev_info(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
 146 +               dev_dbg(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
 147                               pcf->pdata->rails[i].name,
 148                               regulator_registers[i] + 1, tmp & 0xfe);
 149
 150 @@ -2505,7 +2505,7 @@ EXPORT_SYMBOL_GPL(pcf50633_wait_for_ready);
 151
 152  void pcf50633_backlight_resume(struct pcf50633_data *pcf)
 153  {
 154 -       dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
 155 +       dev_dbg(&pcf->client.dev, "pcf50633_backlight_resume\n");
 156
 157         /* platform defines resume ramp speed */
 158         reg_write(pcf, PCF50633_REG_LEDDIM,
 159 @@ -2524,7 +2524,7 @@ static int pcf50633_resume(struct device *dev)
 160         u8 res[5];
 161         u8 misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
 162
 163 -       dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
 164 +       dev_dbg(dev, "pcf50633_resume suspended on entry = %d\n",
 165                                                  (int)pcf->suspend_state);
 166         mutex_lock(&pcf->lock);
 167
 168 --
 169 1.5.6.3
 170