Defines for CIR Registers have been moved to pxa_camera.h. So remove them from
pxa_camera.c to avoid compiler warnings.
Signed-off-by: Luotao Fu <[email protected]>
---
drivers/media/video/pxa_camera.c | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index cb8c5e1..4eda750 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -44,19 +44,6 @@
#define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
#define PXA_CAM_DRV_NAME "pxa27x-camera"
-/* Camera Interface */
-#define CICR0 0x0000
-#define CICR1 0x0004
-#define CICR2 0x0008
-#define CICR3 0x000C
-#define CICR4 0x0010
-#define CISR 0x0014
-#define CIFR 0x0018
-#define CITOR 0x001C
-#define CIBR0 0x0028
-#define CIBR1 0x0030
-#define CIBR2 0x0038
-
#define CICR0_DMAEN (1 << 31) /* DMA request enable */
#define CICR0_PAR_EN (1 << 30) /* Parity enable */
#define CICR0_SL_CAP_EN (1 << 29) /* Capture enable for slave mode */
--
1.5.6.5
On Mon, 5 Jan 2009, Luotao Fu wrote:
> Defines for CIR Registers have been moved to pxa_camera.h. So remove them from
> pxa_camera.c to avoid compiler warnings.
>
> Signed-off-by: Luotao Fu <[email protected]>
> ---
> drivers/media/video/pxa_camera.c | 13 -------------
> 1 files changed, 0 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
> index cb8c5e1..4eda750 100644
> --- a/drivers/media/video/pxa_camera.c
> +++ b/drivers/media/video/pxa_camera.c
> @@ -44,19 +44,6 @@
> #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
> #define PXA_CAM_DRV_NAME "pxa27x-camera"
>
> -/* Camera Interface */
> -#define CICR0 0x0000
> -#define CICR1 0x0004
> -#define CICR2 0x0008
> -#define CICR3 0x000C
> -#define CICR4 0x0010
> -#define CISR 0x0014
> -#define CIFR 0x0018
> -#define CITOR 0x001C
> -#define CIBR0 0x0028
> -#define CIBR1 0x0030
> -#define CIBR2 0x0038
> -
> #define CICR0_DMAEN (1 << 31) /* DMA request enable */
> #define CICR0_PAR_EN (1 << 30) /* Parity enable */
> #define CICR0_SL_CAP_EN (1 << 29) /* Capture enable for slave mode */
> --
> 1.5.6.5
NAK. Please, see an earlier patch from Eric Miao, a correct fix for this
is in the queue.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
On Mon, Jan 05, 2009 at 09:27:35PM +0100, Guennadi Liakhovetski wrote:
> On Mon, 5 Jan 2009, Luotao Fu wrote:
>
> > Defines for CIR Registers have been moved to pxa_camera.h. So remove them from
> > pxa_camera.c to avoid compiler warnings.
> >
> > Signed-off-by: Luotao Fu <[email protected]>
> > ---
> > drivers/media/video/pxa_camera.c | 13 -------------
> > 1 files changed, 0 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
> > index cb8c5e1..4eda750 100644
> > --- a/drivers/media/video/pxa_camera.c
> > +++ b/drivers/media/video/pxa_camera.c
> > @@ -44,19 +44,6 @@
> > #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
> > #define PXA_CAM_DRV_NAME "pxa27x-camera"
> >
> > -/* Camera Interface */
> > -#define CICR0 0x0000
> > -#define CICR1 0x0004
> > -#define CICR2 0x0008
> > -#define CICR3 0x000C
> > -#define CICR4 0x0010
> > -#define CISR 0x0014
> > -#define CIFR 0x0018
> > -#define CITOR 0x001C
> > -#define CIBR0 0x0028
> > -#define CIBR1 0x0030
> > -#define CIBR2 0x0038
> > -
> > #define CICR0_DMAEN (1 << 31) /* DMA request enable */
> > #define CICR0_PAR_EN (1 << 30) /* Parity enable */
> > #define CICR0_SL_CAP_EN (1 << 29) /* Capture enable for slave mode */
> > --
> > 1.5.6.5
>
> NAK. Please, see an earlier patch from Eric Miao, a correct fix for this
> is in the queue.
Ah ok. I checked the mainline git tree and video4linux tree as well as did some
search in a/lkml before I made this patch. I was indeed wondering why such
obvious thing stays unfixed. I'll take a look for the patch by Eric Miao then.
Thanks for the information
cheers
Luotao Fu
--
Pengutronix e.K. | Dipl.-Ing. Luotao Fu |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |