]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] spi_s3c24xx.c: warning fix
authorArnaud Patard (Rtp <arnaud.patard@rtp-net.org>
Fri, 16 Mar 2007 21:38:36 +0000 (13:38 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 17 Mar 2007 02:25:06 +0000 (19:25 -0700)
The set_cs field of struct s3c24xx_spi is declared as returning a int but
the value returned but set_cs is never fixed.  Moreover, the default
function for set_cs and the set_cs defintion in the platform data are
returning void.

I'm proposing to change the prototype to void (*set_cs)(...). By doing
this, I'm also fixing 2 build warnings:

  drivers/spi/spi_s3c24xx.c: In function 's3c24xx_spi_probe':
  drivers/spi/spi_s3c24xx.c:330: warning: assignment from incompatible pointer type
  drivers/spi/spi_s3c24xx.c:335: warning: assignment from incompatible pointer type

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/spi/spi_s3c24xx.c

index 651379c51ae6b691bfd150d815ad5dbecbde77ba..220abce63e4abd12a0b9a3d620265d3caf698b0c 100644 (file)
@@ -41,7 +41,7 @@ struct s3c24xx_spi {
        int                      len;
        int                      count;
 
-       int                     (*set_cs)(struct s3c2410_spi_info *spi,
+       void                    (*set_cs)(struct s3c2410_spi_info *spi,
                                          int cs, int pol);
 
        /* data buffers */