Re: [PATCHv2 1/3] mcp23s08: get rid of setup/teardown callbacks

[Grant Likely]

On Fri, Jul 15, 2011 at 10:25:30AM +0200, Peter Korsgaard wrote:
> There's no in-tree users, and bus notifiers are more generic anyway.
> 
> Signed-off-by: Peter Korsgaard <jacmet@xxxxxxxxxx>

Applied all three, thanks.

g.

> ---
>  drivers/gpio/gpio-mcp23s08.c |   19 -------------------
>  include/linux/spi/mcp23s08.h |    9 ---------
>  2 files changed, 0 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
> index da3e04f..ef61234 100644
> --- a/drivers/gpio/gpio-mcp23s08.c
> +++ b/drivers/gpio/gpio-mcp23s08.c
> @@ -432,14 +432,6 @@ static int mcp23s08_probe(struct spi_device *spi)
>  	 * handled here...
>  	 */
>  
> -	if (pdata->setup) {
> -		status = pdata->setup(spi,
> -				pdata->base, data->ngpio,
> -				pdata->context);
> -		if (status < 0)
> -			dev_dbg(&spi->dev, "setup --> %d\n", status);
> -	}
> -
>  	return 0;
>  
>  fail:
> @@ -459,20 +451,9 @@ fail:
>  static int mcp23s08_remove(struct spi_device *spi)
>  {
>  	struct mcp23s08_driver_data	*data = spi_get_drvdata(spi);
> -	struct mcp23s08_platform_data	*pdata = spi->dev.platform_data;
>  	unsigned			addr;
>  	int				status = 0;
>  
> -	if (pdata->teardown) {
> -		status = pdata->teardown(spi,
> -				pdata->base, data->ngpio,
> -				pdata->context);
> -		if (status < 0) {
> -			dev_err(&spi->dev, "%s --> %d\n", "teardown", status);
> -			return status;
> -		}
> -	}
> -
>  	for (addr = 0; addr < ARRAY_SIZE(data->mcp); addr++) {
>  		int tmp;
>  
> diff --git a/include/linux/spi/mcp23s08.h b/include/linux/spi/mcp23s08.h
> index c42cff8..2d676d5 100644
> --- a/include/linux/spi/mcp23s08.h
> +++ b/include/linux/spi/mcp23s08.h
> @@ -22,13 +22,4 @@ struct mcp23s08_platform_data {
>  	 * base to base+15 (or base+31 for s17 variant).
>  	 */
>  	unsigned	base;
> -
> -	void		*context;	/* param to setup/teardown */
> -
> -	int		(*setup)(struct spi_device *spi,
> -					int gpio, unsigned ngpio,
> -					void *context);
> -	int		(*teardown)(struct spi_device *spi,
> -					int gpio, unsigned ngpio,
> -					void *context);
>  };
> -- 
> 1.7.5.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/