diff options
| author | Nicolas Dufresne <nicolas.dufresne@gmail.com> | 2009-04-13 10:43:30 -0400 |
|---|---|---|
| committer | Nelson Castillo <arhuaco@freaks-unidos.net> | 2009-04-13 17:26:55 -0500 |
| commit | d9a7be9aab65cd86981d60806041ac11fe514277 (patch) | |
| tree | cfde70b9ca4badb4c86a219381a90cce406bff83 /drivers/video | |
| parent | 901d73fe51f33032b34b2ae5612eb863ec90532a (diff) | |
fbcon: Cleaned unnecessary debugging output (fix bug 2265)
Cleaned unnecessary debugging output.
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@gmail.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/console/fbcon.c | 8 | ||||
| -rw-r--r-- | drivers/video/display/jbt6k74.c | 12 |
2 files changed, 7 insertions, 13 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 4cefce8a910..208da5af5f2 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -3130,17 +3130,13 @@ static void fbcon_get_requirement(struct fb_info *info, static int fbcon_event_notify(struct notifier_block *self, unsigned long action, void *data) { - struct fb_event *event; - struct fb_info *info; + struct fb_event *event = data; + struct fb_info *info = event->info; struct fb_videomode *mode; struct fb_con2fbmap *con2fb; struct fb_blit_caps *caps; int ret = 0; - printk(KERN_INFO "fbcon_event_notify action=%ld, data=%p\n", action, data); - - event = data; - info = event->info; /* * ignore all events except driver registration and deregistration * if fbcon is not active diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c index 4524be34df2..5d7a6519de9 100644 --- a/drivers/video/display/jbt6k74.c +++ b/drivers/video/display/jbt6k74.c @@ -523,7 +523,7 @@ static ssize_t gamma_write(struct device *dev, struct device_attribute *attr, int reg = reg_by_string(attr->attr.name); unsigned long val = simple_strtoul(buf, NULL, 10); - dev_info(dev, "**** jbt6k74 writing gama %lu\n", val & 0xff); + dev_info(dev, "writing gama %lu\n", val & 0xff); mutex_lock(&jbt->lock); jbt_reg_write(jbt, reg, val & 0xff); @@ -539,7 +539,7 @@ static ssize_t reset_write(struct device *dev, struct device_attribute *attr, struct jbt_info *jbt = dev_get_drvdata(dev); struct jbt6k74_platform_data *pdata = jbt->spi_dev->dev.platform_data; - dev_info(dev, "**** jbt6k74 reset\n"); + dev_info(dev, "reset\n"); mutex_lock(&jbt->lock); @@ -593,7 +593,7 @@ static int fb_notifier_callback(struct notifier_block *self, jbt = container_of(self, struct jbt_info, fb_notif); - dev_dbg(&jbt->spi_dev->dev, "jbt6k74 event=%lu\n", event); + dev_dbg(&jbt->spi_dev->dev, "event=%lu\n", event); if (event != FB_EVENT_BLANK && event != FB_EVENT_CONBLANK) return 0; @@ -712,7 +712,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state) jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY); - dev_info(&spi->dev, "**** jbt6k74 suspend end\n"); + dev_info(&spi->dev, "suspended\n"); return 0; } @@ -722,14 +722,12 @@ int jbt6k74_resume(struct spi_device *spi) struct jbt_info *jbt = dev_get_drvdata(&spi->dev); struct jbt6k74_platform_data *pdata = spi->dev.platform_data; - dev_info(&spi->dev, "**** jbt6k74 resume start\n"); - jbt6k74_enter_state(jbt, jbt->normal_state); if (pdata->resuming) (pdata->resuming)(0); - dev_info(&spi->dev, "**** jbt6k74 resume end\n"); + dev_info(&spi->dev, "resumed\n"); return 0; } |