From 6d8ef891e5c308431e03c1c0ecdee520ffebc210 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Thu, 12 Jan 2012 08:35:05 +0800 Subject: imx: ipuv3: change dev_err to dev_warn for some function Signed-off-by: Jason Chen --- drivers/mxc/ipu3/ipu_common.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c index 3113e7b933b..24c0f8a05c0 100644 --- a/drivers/mxc/ipu3/ipu_common.c +++ b/drivers/mxc/ipu3/ipu_common.c @@ -910,7 +910,7 @@ void ipu_uninit_channel(struct ipu_soc *ipu, ipu_channel_t channel) _ipu_lock(ipu); if ((ipu->channel_init_mask & (1L << IPU_CHAN_ID(channel))) == 0) { - dev_err(ipu->dev, "Channel already uninitialized %d\n", + dev_warn(ipu->dev, "Channel already uninitialized %d\n", IPU_CHAN_ID(channel)); _ipu_unlock(ipu); return; @@ -923,7 +923,7 @@ void ipu_uninit_channel(struct ipu_soc *ipu, ipu_channel_t channel) if (idma_is_set(ipu, IDMAC_CHA_EN, in_dma) || idma_is_set(ipu, IDMAC_CHA_EN, out_dma)) { - dev_err(ipu->dev, + dev_warn(ipu->dev, "Channel %d is not disabled, disable first\n", IPU_CHAN_ID(channel)); _ipu_unlock(ipu); @@ -1943,7 +1943,7 @@ int32_t ipu_enable_channel(struct ipu_soc *ipu, ipu_channel_t channel) _ipu_lock(ipu); if (ipu->channel_enable_mask & (1L << IPU_CHAN_ID(channel))) { - dev_err(ipu->dev, "Warning: channel already enabled %d\n", + dev_warn(ipu->dev, "Warning: channel already enabled %d\n", IPU_CHAN_ID(channel)); _ipu_unlock(ipu); return -EACCES; @@ -2134,7 +2134,7 @@ int32_t ipu_disable_channel(struct ipu_soc *ipu, ipu_channel_t channel, bool wai _ipu_lock(ipu); if ((ipu->channel_enable_mask & (1L << IPU_CHAN_ID(channel))) == 0) { - dev_err(ipu->dev, "Channel already disabled %d\n", + dev_warn(ipu->dev, "Channel already disabled %d\n", IPU_CHAN_ID(channel)); _ipu_unlock(ipu); return -EACCES; @@ -2182,7 +2182,7 @@ int32_t ipu_disable_channel(struct ipu_soc *ipu, ipu_channel_t channel, bool wai msleep(10); timeout -= 10; if (timeout <= 0) { - dev_err(ipu->dev, "warning: wait for bg sync eof timeout\n"); + dev_warn(ipu->dev, "warning: wait for bg sync eof timeout\n"); break; } } -- cgit v1.2.3