Patchwork [U-Boot] PPC4xx: ALPR: constify FPGA code

login
register
mail settings
Submitter Wolfgang Denk
Date Sept. 5, 2011, 9:43 a.m.
Message ID <1315215809-18490-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/113330/
State Accepted
Commit c2484f40d6c41689769a814e0ae46b9ae210efd1
Headers show

Comments

Wolfgang Denk - Sept. 5, 2011, 9:43 a.m.
The ALPR custom FPGA code was missed by commit e6a857d "fpga:
constify to fix build warning" resulting in such warnings:

fpga.c:226: warning: initialization from incompatible pointer type

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
---
 board/prodrive/alpr/fpga.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Stefan Roese - Sept. 5, 2011, 9:50 a.m.
Hi Wolfgang,

On Monday 05 September 2011 11:43:29 Wolfgang Denk wrote:
> The ALPR custom FPGA code was missed by commit e6a857d "fpga:
> constify to fix build warning" resulting in such warnings:
> 
> fpga.c:226: warning: initialization from incompatible pointer type
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Stefan Roese <sr@denx.de>

Acked-by: Stefan Roese <sr@denx.de>

Wolfgang, please feel free to pull this directly if you prefer.

Thanks.

Best regards,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
Sergei Shtylyov - Sept. 5, 2011, 10:24 a.m.
Hello.

On 05-09-2011 13:43, Wolfgang Denk wrote:

> The ALPR custom FPGA code was missed by commit e6a857d "fpga:
> constify to fix build warning" resulting in such warnings:

> fpga.c:226: warning: initialization from incompatible pointer type

> Signed-off-by: Wolfgang Denk<wd@denx.de>
> Cc: Stefan Roese<sr@denx.de>
> ---
>   board/prodrive/alpr/fpga.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)

> diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c
> index 93f2449..3666a9a 100644
> --- a/board/prodrive/alpr/fpga.c
> +++ b/board/prodrive/alpr/fpga.c
> @@ -168,7 +168,7 @@ int fpga_done_fn (int cookie)
>   /* writes the complete buffer to the FPGA
>      writing the complete buffer in one function is much faster,
>      then calling it for every bit */
> -int fpga_write_fn (void *buf, size_t len, int flush, int cookie)
> +int fpga_write_fn (const void *buf, size_t len, int flush, int cookie)

    I guess this causes checkpatch.pl to complain due to space before (...

WBR, Sergei
Wolfgang Denk - Sept. 5, 2011, 10:25 a.m.
Dear Stefan Roese,

In message <201109051150.46853.sr@denx.de> you wrote:
> 
> Acked-by: Stefan Roese <sr@denx.de>

Thanks.

> Wolfgang, please feel free to pull this directly if you prefer.

Will do, thanks.

Best regards,

Wolfgang Denk
Wolfgang Denk - Sept. 5, 2011, 10:31 a.m.
Dear Sergei Shtylyov,

In message <4E64A372.8030506@mvista.com> you wrote:
> 
> > -int fpga_write_fn (void *buf, size_t len, int flush, int cookie)
> > +int fpga_write_fn (const void *buf, size_t len, int flush, int cookie)
> 
>     I guess this causes checkpatch.pl to complain due to space before (...

Right.  I'll send a separate cleanup patch later.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c
index 93f2449..3666a9a 100644
--- a/board/prodrive/alpr/fpga.c
+++ b/board/prodrive/alpr/fpga.c
@@ -168,7 +168,7 @@  int fpga_done_fn (int cookie)
 /* writes the complete buffer to the FPGA
    writing the complete buffer in one function is much faster,
    then calling it for every bit */
-int fpga_write_fn (void *buf, size_t len, int flush, int cookie)
+int fpga_write_fn (const void *buf, size_t len, int flush, int cookie)
 {
 	size_t bytecount = 0;
 	unsigned char *data = (unsigned char *) buf;