From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Dooks Subject: Re: [patch 2.6.24-rc8] spi: s3c drivers shouldn't care about spi_board_info Date: Tue, 19 Feb 2008 10:10:48 +0000 Message-ID: <20080219101048.GA24550@trinity.fluff.org> References: <200801212341.07086.david-b@pacbell.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Ben Dooks , spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, Andrew Morton To: David Brownell Return-path: Content-Disposition: inline In-Reply-To: <200801212341.07086.david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: spi-devel-general-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: spi-devel-general-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: linux-spi.vger.kernel.org On Mon, Jan 21, 2008 at 11:41:06PM -0800, David Brownell wrote: > 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. For you, for me you've just broken my current in-development patch-set. Numbering busses makes life more difficult when registering the things, as on a design using a pluggable cpu module, you do not know at compile time what bus numbers are going to be assigned, especially if your adapters are not all of the same hardware. > Signed-off-by: David Brownell > --- > I did a test build with the s3c defconfig. The only problem was > with a missing #define breaking the a.out support. > > drivers/spi/spi_s3c24xx.c | 12 ------------ > drivers/spi/spi_s3c24xx_gpio.c | 12 ------------ > include/asm/arch/spi-gpio.h | 6 ------ > include/asm/arch/spi.h | 6 ------ > 4 files changed, 36 deletions(-) > > --- at91.orig/drivers/spi/spi_s3c24xx.c 2008-01-21 23:12:01.000000000 -0800 > +++ at91/drivers/spi/spi_s3c24xx.c 2008-01-21 23:13:42.000000000 -0800 > @@ -237,10 +237,8 @@ static int __init s3c24xx_spi_probe(stru > { > struct s3c24xx_spi *hw; > struct spi_master *master; > - struct spi_board_info *bi; > struct resource *res; > int err = 0; > - int i; > > master = spi_alloc_master(&pdev->dev, sizeof(struct s3c24xx_spi)); > if (master == NULL) { > @@ -348,16 +346,6 @@ static int __init s3c24xx_spi_probe(stru > goto err_register; > } > > - /* register all the devices associated */ > - > - bi = &hw->pdata->board_info[0]; > - for (i = 0; i < hw->pdata->board_size; i++, bi++) { > - dev_info(hw->dev, "registering %s\n", bi->modalias); > - > - bi->controller_data = hw; > - spi_new_device(master, bi); > - } > - > return 0; > > err_register: > --- at91.orig/drivers/spi/spi_s3c24xx_gpio.c 2008-01-21 23:12:01.000000000 -0800 > +++ at91/drivers/spi/spi_s3c24xx_gpio.c 2008-01-21 23:13:26.000000000 -0800 > @@ -100,7 +100,6 @@ static int s3c2410_spigpio_probe(struct > struct spi_master *master; > struct s3c2410_spigpio *sp; > int ret; > - int i; > > master = spi_alloc_master(&dev->dev, sizeof(struct s3c2410_spigpio)); > if (master == NULL) { > @@ -143,17 +142,6 @@ static int s3c2410_spigpio_probe(struct > 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(&dev->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: > --- at91.orig/include/asm/arch/spi-gpio.h 2008-01-21 23:30:56.000000000 -0800 > +++ at91/include/asm/arch/spi-gpio.h 2008-01-21 23:31:59.000000000 -0800 > @@ -13,9 +13,6 @@ > #ifndef __ASM_ARCH_SPIGPIO_H > #define __ASM_ARCH_SPIGPIO_H __FILE__ > > -struct s3c2410_spigpio_info; > -struct spi_board_info; > - > struct s3c2410_spigpio_info { > unsigned long pin_clk; > unsigned long pin_mosi; > @@ -23,9 +20,6 @@ struct s3c2410_spigpio_info { > > int bus_num; > > - unsigned long board_size; > - struct spi_board_info *board_info; > - > void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); > }; > > --- at91.orig/include/asm/arch/spi.h 2008-01-21 23:30:57.000000000 -0800 > +++ at91/include/asm/arch/spi.h 2008-01-21 23:31:50.000000000 -0800 > @@ -13,15 +13,9 @@ > #ifndef __ASM_ARCH_SPI_H > #define __ASM_ARCH_SPI_H __FILE__ > > -struct s3c2410_spi_info; > -struct spi_board_info; > - > struct s3c2410_spi_info { > unsigned long pin_cs; /* simple gpio cs */ > > - unsigned long board_size; > - struct spi_board_info *board_info; > - > void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); > }; > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2008. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > spi-devel-general mailing list > spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org > https://lists.sourceforge.net/lists/listinfo/spi-devel-general -- -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/