[patch 2.6.8-rc6 1/3] spi: fix spi_s3c24xx_gpio device handle lookup

[patch 2.6.8-rc6 1/3] spi: fix spi_s3c24xx_gpio device handle lookup

[David Brownell]

From: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>

The spidev_to_sg() call in spi_s3c24xx_gpio.c was using the
wrong method to convert the spi device into the private data
for the driver. Fix this by using spi_master_get_devdata.

Signed-off-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
Signed-off-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
---
 drivers/spi/spi_s3c24xx_gpio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -34,7 +34,7 @@ struct s3c2410_spigpio {
 
 static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi)
 {
-	return spi->controller_data;
+	return spi_master_get_devdata(spi->master);
 }
 
 static inline void setsck(struct spi_device *dev, int on)

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

Re: [patch 2.6.8-rc6 1/3] spi: fix spi_s3c24xx_gpio device handle lookup

[Andrew Morton]

On Sat, 22 Nov 2008 12:19:01 -0800 David Brownell <david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org> wrote:

> From: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
> 
> The spidev_to_sg() call in spi_s3c24xx_gpio.c was using the
> wrong method to convert the spi device into the private data
> for the driver. Fix this by using spi_master_get_devdata.
> 
> Signed-off-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
> Signed-off-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
> ---
>  drivers/spi/spi_s3c24xx_gpio.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- a/drivers/spi/spi_s3c24xx_gpio.c
> +++ b/drivers/spi/spi_s3c24xx_gpio.c
> @@ -34,7 +34,7 @@ struct s3c2410_spigpio {
>  
>  static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi)
>  {
> -	return spi->controller_data;
> +	return spi_master_get_devdata(spi->master);
>  }
>  
>  static inline void setsck(struct spi_device *dev, int on)

hm.  Why doesn't this oops all over the place?  Is that info presently
duplicated?


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

Re: [patch 2.6.8-rc6 1/3] spi: fix spi_s3c24xx_gpio device handle lookup

[David Brownell]

On Saturday 22 November 2008, Andrew Morton wrote:
> hm.  Why doesn't this oops all over the place? 

I think ... because this driver hasn't been able to
initialize in recent kernels, because of patch #3
being missing.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/