diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2009-03-02 10:45:56 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-02 10:45:56 +0000 |
| commit | a6af63e826b79ae1ba2d8cbfa66805cc2dfe367c (patch) | |
| tree | 920c884b8aef9422b80cf2e5279d51a940836d13 /drivers/mfd | |
| parent | 86247495c3d585349e2a43de416d9275a48bda8c (diff) | |
Subject: Get rid of board_info information in glamo and s3c24xx_gpio spigpio_info.
X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=740c6704e830829d8539a6cc34346ff1980cd9ee
Get rid of board_info information in glamo and s3c24xx_gpio spigpio_info.
The board info does not belong there and has been removed. In
spi_s3c24xx_gpio, board_info has been removed in mainline.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/glamo/glamo-spi-gpio.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c index 2bf4e38ca8e..b92e48a17b7 100644 --- a/drivers/mfd/glamo/glamo-spi-gpio.c +++ b/drivers/mfd/glamo/glamo-spi-gpio.c @@ -44,7 +44,7 @@ struct glamo_spigpio { static inline struct glamo_spigpio *to_sg(struct spi_device *spi) { - return spi->controller_data; + return dev_get_drvdata(&spi->master->dev); } static inline void setsck(struct spi_device *dev, int on) @@ -132,7 +132,6 @@ static int glamo_spigpio_probe(struct platform_device *pdev) struct spi_master *master; struct glamo_spigpio *sp; int ret; - int i; master = spi_alloc_master(&pdev->dev, sizeof(struct glamo_spigpio)); if (master == NULL) { @@ -188,21 +187,12 @@ static int glamo_spigpio_probe(struct platform_device *pdev) sp->bitbang.master->setup = glamo_spi_setup; #endif + dev_set_drvdata(&sp->master->dev, sp); + ret = spi_bitbang_start(&sp->bitbang); if (ret) goto err_no_bitbang; - /* register the chips to go with the board */ - - for (i = 0; i < sp->info->board_size; i++) { - dev_info(&pdev->dev, "registering %p: %s\n", - &sp->info->board_info[i], - sp->info->board_info[i].modalias); - - sp->info->board_info[i].controller_data = sp; - spi_new_device(master, sp->info->board_info + i); - } - return 0; err_no_bitbang: |