target/linux/s3c24xx/patches-2.6.24/1239-debug-move-dev-info-to-dbg.patch.patch

   1 From 7588286c13ce04de9ce9b9a844033e07d0e71c93 Mon Sep 17 00:00:00 2001
   2 From: Andy Green <andy@openmoko.com>
   3 Date: Mon, 21 Jul 2008 00:51:15 +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           |   30 +++++++++++++++---------------
  18  2 files changed, 17 insertions(+), 17 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 5ef23d1..dd63506 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 f461378..af36e33 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 @@ -817,7 +817,7 @@ static void pcf50633_work(struct work_struct *work)
  92                                                 sizeof(pcfirq),
  93                                                 pcfirq);
  94         if (ret != sizeof(pcfirq)) {
  95 -               dev_info(&pcf->client.dev,
  96 +               dev_dbg(&pcf->client.dev,
  97                         "Oh crap PMU IRQ register read failed -- "
  98                         "retrying later %d\n", ret);
  99                 /*
 100 @@ -1214,7 +1214,7 @@ reschedule:
 101         if ((pcf->suspend_state != PCF50633_SS_STARTING_SUSPEND) &&
 102             (pcf->suspend_state != PCF50633_SS_COMPLETED_SUSPEND)) {
 103                 msleep(10);
 104 -               dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
 105 +               dev_dbg(&pcf->client.dev, "rescheduling interrupt service\n");
 106         }
 107         if (!schedule_work(&pcf->work))
 108                 dev_err(&pcf->client.dev, "int service reschedule failed\n");
 109 @@ -1228,7 +1228,7 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
 110         struct pcf50633_data *pcf = _pcf;
 111
 112         DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
 113 -       dev_info(&pcf->client.dev, "pcf50633_irq scheduling work\n");
 114 +       dev_dbg(&pcf->client.dev, "pcf50633_irq scheduling work\n");
 115
 116         get_device(&pcf->client.dev);
 117         if (!schedule_work(&pcf->work) && !pcf->working)
 118 @@ -1740,7 +1740,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
 119
 120         mutex_unlock(&pcf->lock);
 121
 122 -       dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 123 +       dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 124                 pcf_tm.time[PCF50633_TI_DAY],
 125                 pcf_tm.time[PCF50633_TI_MONTH],
 126                 pcf_tm.time[PCF50633_TI_YEAR],
 127 @@ -1750,7 +1750,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
 128
 129         pcf2rtc_time(tm, &pcf_tm);
 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
 136 @@ -1764,11 +1764,11 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
 137         struct pcf50633_time pcf_tm;
 138         int ret;
 139
 140 -       dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
 141 +       dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
 142                 tm->tm_mday, tm->tm_mon, tm->tm_year,
 143                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 144         rtc2pcf_time(&pcf_tm, tm);
 145 -       dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 146 +       dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
 147                 pcf_tm.time[PCF50633_TI_DAY],
 148                 pcf_tm.time[PCF50633_TI_MONTH],
 149                 pcf_tm.time[PCF50633_TI_YEAR],
 150 @@ -2432,7 +2432,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
 151                 else
 152                         tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
 153
 154 -               dev_info(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
 155 +               dev_dbg(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
 156                               pcf->pdata->rails[i].name,
 157                               regulator_registers[i] + 1, tmp & 0xfe);
 158
 159 @@ -2507,7 +2507,7 @@ EXPORT_SYMBOL_GPL(pcf50633_wait_for_ready);
 160
 161  void pcf50633_backlight_resume(struct pcf50633_data *pcf)
 162  {
 163 -       dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
 164 +       dev_dbg(&pcf->client.dev, "pcf50633_backlight_resume\n");
 165
 166         /* platform defines resume ramp speed */
 167         reg_write(pcf, PCF50633_REG_LEDDIM,
 168 @@ -2526,7 +2526,7 @@ static int pcf50633_resume(struct device *dev)
 169         u8 res[5];
 170         u8 misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
 171
 172 -       dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
 173 +       dev_dbg(dev, "pcf50633_resume suspended on entry = %d\n",
 174                                                  (int)pcf->suspend_state);
 175         mutex_lock(&pcf->lock);
 176
 177 --
 178 1.5.6.5
 179