[PATCH] spi: remove fastcall crap

gcc4 generates warnings when a non-FASTCALL function pointer is assigned to a
FASTCALL one.  Perhaps it has taste.

Cc: David Brownell <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index cdb242de901d1c1036ded5cb17410874ef917457..791c4dc550aee0e7df764270282ef977edf6a151 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -480,6 +480,11 @@ EXPORT_SYMBOL_GPL(spi_busnum_to_master);
 
 /*-------------------------------------------------------------------------*/
 
 
 /*-------------------------------------------------------------------------*/
 

+static void spi_complete(void *arg)
+{
+       complete(arg);
+}
+

 /**
  * spi_sync - blocking/synchronous SPI data transfers
  * @spi: device with which data will be exchanged
 /**
  * spi_sync - blocking/synchronous SPI data transfers
  * @spi: device with which data will be exchanged


@@ -508,7 +513,7 @@ int spi_sync(struct spi_device *spi, struct spi_message *message)
        DECLARE_COMPLETION(done);
        int status;
 
        DECLARE_COMPLETION(done);
        int status;
 

-       message->complete = (void (*)(void *)) complete;
+       message->complete = spi_complete;

        message->context = &done;
        status = spi_async(spi, message);
        if (status == 0)
        message->context = &done;
        status = spi_async(spi, message);
        if (status == 0)

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 939afd3a2e722544976ce05b1d0bc62b0138056f..b05f1463a2676de35237dda137772ad70dc1c93d 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -374,7 +374,7 @@ struct spi_message {
         */
 
        /* completion is reported through a callback */
         */
 
        /* completion is reported through a callback */

-       void                    FASTCALL((*complete)(void *context));
+       void                    (*complete)(void *context);

        void                    *context;
        unsigned                actual_length;
        int                     status;
        void                    *context;
        unsigned                actual_length;
        int                     status;