diff mbox

[5/6] media: i.MX27 camera: fix compilation warning.

Message ID 1329141115-23133-6-git-send-email-javier.martin@vista-silicon.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Javier Martin Feb. 13, 2012, 1:51 p.m. UTC 
  Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
---
 drivers/media/video/mx2_camera.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Comments

Guennadi Liakhovetski Feb. 13, 2012, 2:10 p.m. UTC | #1 
Hi Javier

On Mon, 13 Feb 2012, Javier Martin wrote:

> 
> Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
> ---
>  drivers/media/video/mx2_camera.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
> index d9028f1..8ccdb4a 100644
> --- a/drivers/media/video/mx2_camera.c
> +++ b/drivers/media/video/mx2_camera.c
> @@ -1210,7 +1210,9 @@ static struct soc_camera_host_ops mx2_soc_camera_host_ops = {
>  static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
>  		int bufnum, bool err)
>  {
> +#ifdef DEBUG
>  	struct mx2_fmt_cfg *prp = pcdev->emma_prp;
> +#endif
>  	struct mx2_buffer *buf;
>  	struct vb2_buffer *vb;
>  	unsigned long phys;
> @@ -1232,18 +1234,16 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
>  		if (prp->cfg.channel == 1) {
>  			if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR +
>  				4 * bufnum) != phys) {
> -				dev_err(pcdev->dev, "%p != %p\n", phys,
> -						readl(pcdev->base_emma +
> -							PRP_DEST_RGB1_PTR +
> -							4 * bufnum));
> +				dev_err(pcdev->dev, "%p != %p\n", (void *)phys,
> +					(void *)readl(pcdev->base_emma +
> +					PRP_DEST_RGB1_PTR + 4 * bufnum));
>  			}
>  		} else {
>  			if (readl(pcdev->base_emma + PRP_DEST_Y_PTR -
>  				0x14 * bufnum) != phys) {
> -				dev_err(pcdev->dev, "%p != %p\n", phys,
> -						readl(pcdev->base_emma +
> -							PRP_DEST_Y_PTR -
> -							0x14 * bufnum));
> +				dev_err(pcdev->dev, "%p != %p\n", (void *)phys,
> +					(void *)readl(pcdev->base_emma +
> +					PRP_DEST_Y_PTR - 0x14 * bufnum));

I think, just using %lx would be better.

>  			}
>  		}
>  #endif
> -- 
> 1.7.0.4

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Javier Martin Feb. 13, 2012, 2:41 p.m. UTC | #2 
On 13 February 2012 15:10, Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote:
> Hi Javier
>
> On Mon, 13 Feb 2012, Javier Martin wrote:
>
>>
>> Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
>> ---
>>  drivers/media/video/mx2_camera.c |   16 ++++++++--------
>>  1 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
>> index d9028f1..8ccdb4a 100644
>> --- a/drivers/media/video/mx2_camera.c
>> +++ b/drivers/media/video/mx2_camera.c
>> @@ -1210,7 +1210,9 @@ static struct soc_camera_host_ops mx2_soc_camera_host_ops = {
>>  static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
>>               int bufnum, bool err)
>>  {
>> +#ifdef DEBUG
>>       struct mx2_fmt_cfg *prp = pcdev->emma_prp;
>> +#endif
>>       struct mx2_buffer *buf;
>>       struct vb2_buffer *vb;
>>       unsigned long phys;
>> @@ -1232,18 +1234,16 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
>>               if (prp->cfg.channel == 1) {
>>                       if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR +
>>                               4 * bufnum) != phys) {
>> -                             dev_err(pcdev->dev, "%p != %p\n", phys,
>> -                                             readl(pcdev->base_emma +
>> -                                                     PRP_DEST_RGB1_PTR +
>> -                                                     4 * bufnum));
>> +                             dev_err(pcdev->dev, "%p != %p\n", (void *)phys,
>> +                                     (void *)readl(pcdev->base_emma +
>> +                                     PRP_DEST_RGB1_PTR + 4 * bufnum));
>>                       }
>>               } else {
>>                       if (readl(pcdev->base_emma + PRP_DEST_Y_PTR -
>>                               0x14 * bufnum) != phys) {
>> -                             dev_err(pcdev->dev, "%p != %p\n", phys,
>> -                                             readl(pcdev->base_emma +
>> -                                                     PRP_DEST_Y_PTR -
>> -                                                     0x14 * bufnum));
>> +                             dev_err(pcdev->dev, "%p != %p\n", (void *)phys,
>> +                                     (void *)readl(pcdev->base_emma +
>> +                                     PRP_DEST_Y_PTR - 0x14 * bufnum));
>
> I think, just using %lx would be better.

Fixed.
Please, see v2.
diff mbox

Patch

diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index d9028f1..8ccdb4a 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -1210,7 +1210,9 @@  static struct soc_camera_host_ops mx2_soc_camera_host_ops = {
 static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
 		int bufnum, bool err)
 {
+#ifdef DEBUG
 	struct mx2_fmt_cfg *prp = pcdev->emma_prp;
+#endif
 	struct mx2_buffer *buf;
 	struct vb2_buffer *vb;
 	unsigned long phys;
@@ -1232,18 +1234,16 @@  static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
 		if (prp->cfg.channel == 1) {
 			if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR +
 				4 * bufnum) != phys) {
-				dev_err(pcdev->dev, "%p != %p\n", phys,
-						readl(pcdev->base_emma +
-							PRP_DEST_RGB1_PTR +
-							4 * bufnum));
+				dev_err(pcdev->dev, "%p != %p\n", (void *)phys,
+					(void *)readl(pcdev->base_emma +
+					PRP_DEST_RGB1_PTR + 4 * bufnum));
 			}
 		} else {
 			if (readl(pcdev->base_emma + PRP_DEST_Y_PTR -
 				0x14 * bufnum) != phys) {
-				dev_err(pcdev->dev, "%p != %p\n", phys,
-						readl(pcdev->base_emma +
-							PRP_DEST_Y_PTR -
-							0x14 * bufnum));
+				dev_err(pcdev->dev, "%p != %p\n", (void *)phys,
+					(void *)readl(pcdev->base_emma +
+					PRP_DEST_Y_PTR - 0x14 * bufnum));
 			}
 		}
 #endif