Message ID | 1255017850-31236-2-git-send-email-brad.figg@canonical.com |
---|---|
State | Rejected |
Headers | show |
Brad Figg wrote: > BugLink: https://bugs.launchpad.net/ubuntu/+bugs/438680 > > Signed-off-by: Brad Figg <brad.figg@canonical.com> > --- > drivers/mxc/ipu3/ipu_common.c | 6 +++--- > drivers/mxc/security/scc2_driver.c | 2 +- > drivers/video/mxc/mxc_ipuv3_fb.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c > index 4fe100c..57b5e66 100644 > --- a/drivers/mxc/ipu3/ipu_common.c > +++ b/drivers/mxc/ipu3/ipu_common.c > @@ -631,7 +631,7 @@ void ipu_uninit_channel(ipu_channel_t channel) > uint32_t ipu_conf; > > if ((g_channel_init_mask & (1L << IPU_CHAN_ID(channel))) == 0) { > - dev_err(g_ipu_dev, "Channel already uninitialized %d\n", > + dev_dbg(g_ipu_dev, "Channel already uninitialized %d\n", > IPU_CHAN_ID(channel)); > return; > } > @@ -643,7 +643,7 @@ void ipu_uninit_channel(ipu_channel_t channel) > > if (idma_is_set(IDMAC_CHA_EN, in_dma) || > idma_is_set(IDMAC_CHA_EN, out_dma)) { > - dev_err(g_ipu_dev, > + dev_dbg(g_ipu_dev, > "Channel %d is not disabled, disable first\n", > IPU_CHAN_ID(channel)); > return; > @@ -1503,7 +1503,7 @@ int32_t ipu_disable_channel(ipu_channel_t channel, bool wait_for_stop) > uint32_t timeout; > > if ((g_channel_enable_mask & (1L << IPU_CHAN_ID(channel))) == 0) { > - dev_err(g_ipu_dev, "Channel already disabled %d\n", > + dev_dbg(g_ipu_dev, "Channel already disabled %d\n", > IPU_CHAN_ID(channel)); > return 0; > } > diff --git a/drivers/mxc/security/scc2_driver.c b/drivers/mxc/security/scc2_driver.c > index 4ed2931..bf946cb 100644 > --- a/drivers/mxc/security/scc2_driver.c > +++ b/drivers/mxc/security/scc2_driver.c > @@ -640,7 +640,7 @@ static int scc_init(void) > } > } > /* ! STATUS_INITIAL */ > - os_printk(KERN_ALERT "SCC2: Driver Status is %s\n", > + os_printk(KERN_DEBUG "SCC2: Driver Status is %s\n", > (scc_availability == SCC_STATUS_INITIAL) ? "INITIAL" : > (scc_availability == SCC_STATUS_CHECKING) ? "CHECKING" : > (scc_availability == > diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c > index 5626c68..42a1a49 100644 > --- a/drivers/video/mxc/mxc_ipuv3_fb.c > +++ b/drivers/video/mxc/mxc_ipuv3_fb.c > @@ -990,7 +990,7 @@ static int mxcfb_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, fbi); > > - dev_err(&pdev->dev, "fb registered, using mode %s\n", fb_mode); > + dev_dbg(&pdev->dev, "fb registered, using mode %s\n", fb_mode); > return 0; > > err2: Do not apply
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c index 4fe100c..57b5e66 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -631,7 +631,7 @@ void ipu_uninit_channel(ipu_channel_t channel) uint32_t ipu_conf; if ((g_channel_init_mask & (1L << IPU_CHAN_ID(channel))) == 0) { - dev_err(g_ipu_dev, "Channel already uninitialized %d\n", + dev_dbg(g_ipu_dev, "Channel already uninitialized %d\n", IPU_CHAN_ID(channel)); return; } @@ -643,7 +643,7 @@ void ipu_uninit_channel(ipu_channel_t channel) if (idma_is_set(IDMAC_CHA_EN, in_dma) || idma_is_set(IDMAC_CHA_EN, out_dma)) { - dev_err(g_ipu_dev, + dev_dbg(g_ipu_dev, "Channel %d is not disabled, disable first\n", IPU_CHAN_ID(channel)); return; @@ -1503,7 +1503,7 @@ int32_t ipu_disable_channel(ipu_channel_t channel, bool wait_for_stop) uint32_t timeout; if ((g_channel_enable_mask & (1L << IPU_CHAN_ID(channel))) == 0) { - dev_err(g_ipu_dev, "Channel already disabled %d\n", + dev_dbg(g_ipu_dev, "Channel already disabled %d\n", IPU_CHAN_ID(channel)); return 0; } diff --git a/drivers/mxc/security/scc2_driver.c b/drivers/mxc/security/scc2_driver.c index 4ed2931..bf946cb 100644 --- a/drivers/mxc/security/scc2_driver.c +++ b/drivers/mxc/security/scc2_driver.c @@ -640,7 +640,7 @@ static int scc_init(void) } } /* ! STATUS_INITIAL */ - os_printk(KERN_ALERT "SCC2: Driver Status is %s\n", + os_printk(KERN_DEBUG "SCC2: Driver Status is %s\n", (scc_availability == SCC_STATUS_INITIAL) ? "INITIAL" : (scc_availability == SCC_STATUS_CHECKING) ? "CHECKING" : (scc_availability == diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c index 5626c68..42a1a49 100644 --- a/drivers/video/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/mxc/mxc_ipuv3_fb.c @@ -990,7 +990,7 @@ static int mxcfb_probe(struct platform_device *pdev) platform_set_drvdata(pdev, fbi); - dev_err(&pdev->dev, "fb registered, using mode %s\n", fb_mode); + dev_dbg(&pdev->dev, "fb registered, using mode %s\n", fb_mode); return 0; err2:
BugLink: https://bugs.launchpad.net/ubuntu/+bugs/438680 Signed-off-by: Brad Figg <brad.figg@canonical.com> --- drivers/mxc/ipu3/ipu_common.c | 6 +++--- drivers/mxc/security/scc2_driver.c | 2 +- drivers/video/mxc/mxc_ipuv3_fb.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)