On Mon, Jan 31, 2011 at 03:46, Aaron.Wu wrote:
> --- a/include/linux/spi/spi.h
> +++ b/include/linux/spi/spi.h
> @@ -240,9 +246,9 @@ static inline void spi_unregister_driver(struct 
> spi_driver *sdrv)
>  */
>  struct spi_master {
>        struct device   dev;
> -
>        struct list_head list;
>
> +
>        /* other than negative (== assign one dynamically), bus_num is fully
>         * board-specific.  usually that simplifies to being SOC-specific.
>         * example:  one SOC has three SPI controllers, numbered 0..2,

please avoid useless whitespace changes

> @@ -309,6 +315,50 @@ struct spi_master {
>
>        /* called on release() to free memory provided by spi_master */
>        void                    (*cleanup)(struct spi_device *spi);
> +
> +       int                     (*lock_bus)(struct spi_device *spi);
> +       int                     (*unlock_bus)(struct spi_device *spi);
> +};
> @@ -557,8 +635,6 @@ static inline void spi_message_free(struct spi_message *m)
>
>  extern int spi_setup(struct spi_device *spi);
>  extern int spi_async(struct spi_device *spi, struct spi_message *message);
> -extern int spi_async_locked(struct spi_device *spi,
> -                           struct spi_message *message);
>
>  /*---------------------------------------------------------------------------*/
>
> @@ -568,9 +644,8 @@ extern int spi_async_locked(struct spi_device *spi,
>  */
>
>  extern int spi_sync(struct spi_device *spi, struct spi_message *message);
> -extern int spi_sync_locked(struct spi_device *spi, struct spi_message 
> *message);
> -extern int spi_bus_lock(struct spi_master *master);
> -extern int spi_bus_unlock(struct spi_master *master);
> +extern int spi_lock_bus(struct spi_device *spi);
> +extern int spi_unlock_bus(struct spi_device *spi);

why are you changing the bus lock/unlock api ?
-mike

------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
spi-devel-general mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spi-devel-general

Reply via email to