Commit 1bb6f9b0 authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Grant Likely
Browse files

mcp23s08: get rid of setup/teardown callbacks 



There's no in-tree users, and bus notifiers are more generic anyway.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent eb5064db

drivers/gpio/gpio-mcp23s08.c

+0 −19
Original line number Diff line number Diff line
@@ -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 @@ static int mcp23s08_probe(struct spi_device *spi) 
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;

include/linux/spi/mcp23s08.h

+0 −9
Original line number Diff line number Diff line
@@ -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);

};