spi_s3c24xx: really assign busnum

The original "Pass the bus number we expect the S3C24XX SPI driver to
attach to via the platform data." [1] patch was mis-sent, and missed two
important parts of the diff, which was to actually set the bus_num field
and add the relevant field to the platform data.

The previous commit 50f426b55d919dd017af35bb6a08753d1f262920 promised to
add a bus_num field, but failed to include the two hunks that added this
field to include/asm-arm/arch-s3c2410/spi.h and then pass it to the spi
core when creating the new master field in drivers/spi/spi_s3c24xx.c.

[1] git commit 50f426b55d919dd017af35bb6a08753d1f262920

Signed-off-by: Ben Dooks <ben-linux@fluff.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>

authored by

Ben Dooks and committed by
Linus Torvalds
cb1d0a7a 9a7867e1

+2
+1
drivers/spi/spi_s3c24xx.c
··· 270 270 /* setup the master state. */ 271 271 272 272 master->num_chipselect = hw->pdata->num_cs; 273 + master->bus_num = pdata->bus_num; 273 274 274 275 /* setup the state for the bitbang driver */ 275 276
+1
include/asm-arm/arch-s3c2410/spi.h
··· 16 16 struct s3c2410_spi_info { 17 17 unsigned long pin_cs; /* simple gpio cs */ 18 18 unsigned int num_cs; /* total chipselects */ 19 + int bus_num; /* bus number to use. */ 19 20 20 21 void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); 21 22 };