From: Guennadi Liakhovetski Use the newly introduced owner field in struct gpio_chip to protect the current (small) set of non-SOC GPIO drivers from being unloaded while any of their GPIOs are in use. Signed-off-by: Guennadi Liakhovetski [ add mcp23s08 and pcf857x ] Signed-off-by: David Brownell Signed-off-by: Andrew Morton --- drivers/gpio/mcp23s08.c | 1 + drivers/gpio/pca953x.c | 1 + drivers/gpio/pcf857x.c | 1 + 3 files changed, 3 insertions(+) diff -puN drivers/gpio/mcp23s08.c~gpiolib-i2c-spi-drivers-handle-rmmod-better drivers/gpio/mcp23s08.c --- a/drivers/gpio/mcp23s08.c~gpiolib-i2c-spi-drivers-handle-rmmod-better +++ a/drivers/gpio/mcp23s08.c @@ -239,6 +239,7 @@ static int mcp23s08_probe(struct spi_dev mcp->chip.base = pdata->base; mcp->chip.ngpio = 8; mcp->chip.can_sleep = 1; + mcp->chip.owner = THIS_MODULE; spi_set_drvdata(spi, mcp); diff -puN drivers/gpio/pca953x.c~gpiolib-i2c-spi-drivers-handle-rmmod-better drivers/gpio/pca953x.c --- a/drivers/gpio/pca953x.c~gpiolib-i2c-spi-drivers-handle-rmmod-better +++ a/drivers/gpio/pca953x.c @@ -189,6 +189,7 @@ static void pca953x_setup_gpio(struct pc gc->base = chip->gpio_start; gc->ngpio = gpios; gc->label = chip->client->name; + gc->owner = THIS_MODULE; } static int __devinit pca953x_probe(struct i2c_client *client) diff -puN drivers/gpio/pcf857x.c~gpiolib-i2c-spi-drivers-handle-rmmod-better drivers/gpio/pcf857x.c --- a/drivers/gpio/pcf857x.c~gpiolib-i2c-spi-drivers-handle-rmmod-better +++ a/drivers/gpio/pcf857x.c @@ -159,6 +159,7 @@ static int pcf857x_probe(struct i2c_clie gpio->chip.base = pdata->gpio_base; gpio->chip.can_sleep = 1; + gpio->chip.owner = THIS_MODULE; /* NOTE: the OnSemi jlc1562b is also largely compatible with * these parts, notably for output. It has a low-resolution _