aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2008-02-06 04:38:13 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:11 -0500
commitb359fbc4582abf346fa6773b2bc1d63581fda582 (patch)
treed759a99e9aee0cc23f62cb41335069610b9dd027 /drivers/spi
parent8bacb219018a52e6f02a3cff6a7badf102ddfc44 (diff)
spi: s3c drivers shouldn't care about spi_board_info
The two S3C SPI master drivers got merged without much review, so I just noticed that they're doing something that the SPI core code is responsible for, rather than any adapter driver: they try to register SPI devices. This removes that support from those drivers so they act normally. Interestingly, none of the current boards are affected. So it's a net code shrink with no loss of functionality. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_s3c24xx.c12
-rw-r--r--drivers/spi/spi_s3c24xx_gpio.c12
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 89d6685a5ca..6e834b8b9d2 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -237,10 +237,8 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
237{ 237{
238 struct s3c24xx_spi *hw; 238 struct s3c24xx_spi *hw;
239 struct spi_master *master; 239 struct spi_master *master;
240 struct spi_board_info *bi;
241 struct resource *res; 240 struct resource *res;
242 int err = 0; 241 int err = 0;
243 int i;
244 242
245 master = spi_alloc_master(&pdev->dev, sizeof(struct s3c24xx_spi)); 243 master = spi_alloc_master(&pdev->dev, sizeof(struct s3c24xx_spi));
246 if (master == NULL) { 244 if (master == NULL) {
@@ -348,16 +346,6 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
348 goto err_register; 346 goto err_register;
349 } 347 }
350 348
351 /* register all the devices associated */
352
353 bi = &hw->pdata->board_info[0];
354 for (i = 0; i < hw->pdata->board_size; i++, bi++) {
355 dev_info(hw->dev, "registering %s\n", bi->modalias);
356
357 bi->controller_data = hw;
358 spi_new_device(master, bi);
359 }
360
361 return 0; 349 return 0;
362 350
363 err_register: 351 err_register:
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 109d82c1abc..82ae7d7eca3 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -100,7 +100,6 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
100 struct spi_master *master; 100 struct spi_master *master;
101 struct s3c2410_spigpio *sp; 101 struct s3c2410_spigpio *sp;
102 int ret; 102 int ret;
103 int i;
104 103
105 master = spi_alloc_master(&dev->dev, sizeof(struct s3c2410_spigpio)); 104 master = spi_alloc_master(&dev->dev, sizeof(struct s3c2410_spigpio));
106 if (master == NULL) { 105 if (master == NULL) {
@@ -143,17 +142,6 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
143 if (ret) 142 if (ret)
144 goto err_no_bitbang; 143 goto err_no_bitbang;
145 144
146 /* register the chips to go with the board */
147
148 for (i = 0; i < sp->info->board_size; i++) {
149 dev_info(&dev->dev, "registering %p: %s\n",
150 &sp->info->board_info[i],
151 sp->info->board_info[i].modalias);
152
153 sp->info->board_info[i].controller_data = sp;
154 spi_new_device(master, sp->info->board_info + i);
155 }
156
157 return 0; 145 return 0;
158 146
159 err_no_bitbang: 147 err_no_bitbang: