spi: make remove callback a void function

The value returned by an spi driver's remove function is mostly ignored.
(Only an error message is printed if the value is non-zero that the
error is ignored.)

So change the prototype of the remove function to return no value. This
way driver authors are not tempted to assume that passing an error to
the upper layer is a good idea. All drivers are adapted accordingly.
There is no intended change of behaviour, all callbacks were prepared to
return 0 before.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Claudius Heine <ch@denx.de>
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Acked-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Acked-by: Łukasz Stelmach <l.stelmach@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220123175201.34839-6-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Uwe Kleine-König 2022-01-23 18:52:01 +01:00 committed by Mark Brown
parent afb0a80e63
commit a0386bba70
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
191 changed files with 197 additions and 545 deletions

View File

@ -815,7 +815,7 @@ static int moxtet_probe(struct spi_device *spi)
return 0;
}
static int moxtet_remove(struct spi_device *spi)
static void moxtet_remove(struct spi_device *spi)
{
struct moxtet *moxtet = spi_get_drvdata(spi);
@ -828,8 +828,6 @@ static int moxtet_remove(struct spi_device *spi)
device_for_each_child(moxtet->dev, NULL, __unregister);
mutex_destroy(&moxtet->lock);
return 0;
}
static const struct of_device_id moxtet_dt_ids[] = {

View File

@ -381,13 +381,11 @@ static int st33zp24_spi_probe(struct spi_device *dev)
* @param: client, the spi_device description (TPM SPI description).
* @return: 0 in case of success.
*/
static int st33zp24_spi_remove(struct spi_device *dev)
static void st33zp24_spi_remove(struct spi_device *dev)
{
struct tpm_chip *chip = spi_get_drvdata(dev);
st33zp24_remove(chip);
return 0;
}
static const struct spi_device_id st33zp24_spi_id[] = {

View File

@ -254,13 +254,12 @@ static int tpm_tis_spi_driver_probe(struct spi_device *spi)
static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_spi_resume);
static int tpm_tis_spi_remove(struct spi_device *dev)
static void tpm_tis_spi_remove(struct spi_device *dev)
{
struct tpm_chip *chip = spi_get_drvdata(dev);
tpm_chip_unregister(chip);
tpm_tis_remove(chip);
return 0;
}
static const struct spi_device_id tpm_tis_spi_id[] = {

View File

@ -1544,14 +1544,12 @@ static int lmk04832_probe(struct spi_device *spi)
return ret;
}
static int lmk04832_remove(struct spi_device *spi)
static void lmk04832_remove(struct spi_device *spi)
{
struct lmk04832 *lmk = spi_get_drvdata(spi);
clk_disable_unprepare(lmk->oscin);
of_clk_del_provider(spi->dev.of_node);
return 0;
}
static const struct spi_device_id lmk04832_id[] = {
{ "lmk04832", LMK04832 },

View File

@ -163,15 +163,13 @@ static int gen_74x164_probe(struct spi_device *spi)
return ret;
}
static int gen_74x164_remove(struct spi_device *spi)
static void gen_74x164_remove(struct spi_device *spi)
{
struct gen_74x164_chip *chip = spi_get_drvdata(spi);
gpiod_set_value_cansleep(chip->gpiod_oe, 0);
gpiochip_remove(&chip->gpio_chip);
mutex_destroy(&chip->lock);
return 0;
}
static const struct spi_device_id gen_74x164_spi_ids[] = {

View File

@ -443,14 +443,12 @@ static int max3191x_probe(struct spi_device *spi)
return 0;
}
static int max3191x_remove(struct spi_device *spi)
static void max3191x_remove(struct spi_device *spi)
{
struct max3191x_chip *max3191x = spi_get_drvdata(spi);
gpiochip_remove(&max3191x->gpio);
mutex_destroy(&max3191x->lock);
return 0;
}
static int __init max3191x_register_driver(struct spi_driver *sdrv)

View File

@ -64,11 +64,9 @@ static int max7301_probe(struct spi_device *spi)
return ret;
}
static int max7301_remove(struct spi_device *spi)
static void max7301_remove(struct spi_device *spi)
{
__max730x_remove(&spi->dev);
return 0;
}
static const struct spi_device_id max7301_id[] = {

View File

@ -134,7 +134,7 @@ static int mc33880_probe(struct spi_device *spi)
return ret;
}
static int mc33880_remove(struct spi_device *spi)
static void mc33880_remove(struct spi_device *spi)
{
struct mc33880 *mc;
@ -142,8 +142,6 @@ static int mc33880_remove(struct spi_device *spi)
gpiochip_remove(&mc->chip);
mutex_destroy(&mc->lock);
return 0;
}
static struct spi_driver mc33880_driver = {

View File

@ -163,15 +163,13 @@ static int pisosr_gpio_probe(struct spi_device *spi)
return 0;
}
static int pisosr_gpio_remove(struct spi_device *spi)
static void pisosr_gpio_remove(struct spi_device *spi)
{
struct pisosr_gpio *gpio = spi_get_drvdata(spi);
gpiochip_remove(&gpio->chip);
mutex_destroy(&gpio->lock);
return 0;
}
static const struct spi_device_id pisosr_gpio_id_table[] = {

View File

@ -293,15 +293,13 @@ static int y030xx067a_probe(struct spi_device *spi)
return 0;
}
static int y030xx067a_remove(struct spi_device *spi)
static void y030xx067a_remove(struct spi_device *spi)
{
struct y030xx067a *priv = spi_get_drvdata(spi);
drm_panel_remove(&priv->panel);
drm_panel_disable(&priv->panel);
drm_panel_unprepare(&priv->panel);
return 0;
}
static const struct drm_display_mode y030xx067a_modes[] = {

View File

@ -896,14 +896,12 @@ static int ili9322_probe(struct spi_device *spi)
return 0;
}
static int ili9322_remove(struct spi_device *spi)
static void ili9322_remove(struct spi_device *spi)
{
struct ili9322 *ili = spi_get_drvdata(spi);
ili9322_power_off(ili);
drm_panel_remove(&ili->panel);
return 0;
}
/*

View File

@ -728,7 +728,7 @@ static int ili9341_probe(struct spi_device *spi)
return -1;
}
static int ili9341_remove(struct spi_device *spi)
static void ili9341_remove(struct spi_device *spi)
{
const struct spi_device_id *id = spi_get_device_id(spi);
struct ili9341 *ili = spi_get_drvdata(spi);
@ -741,7 +741,6 @@ static int ili9341_remove(struct spi_device *spi)
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
}
return 0;
}
static void ili9341_shutdown(struct spi_device *spi)

View File

@ -219,15 +219,13 @@ static int ej030na_probe(struct spi_device *spi)
return 0;
}
static int ej030na_remove(struct spi_device *spi)
static void ej030na_remove(struct spi_device *spi)
{
struct ej030na *priv = spi_get_drvdata(spi);
drm_panel_remove(&priv->panel);
drm_panel_disable(&priv->panel);
drm_panel_unprepare(&priv->panel);
return 0;
}
static const struct drm_display_mode ej030na_modes[] = {

View File

@ -203,14 +203,12 @@ static int lb035q02_probe(struct spi_device *spi)
return 0;
}
static int lb035q02_remove(struct spi_device *spi)
static void lb035q02_remove(struct spi_device *spi)
{
struct lb035q02_device *lcd = spi_get_drvdata(spi);
drm_panel_remove(&lcd->panel);
drm_panel_disable(&lcd->panel);
return 0;
}
static const struct of_device_id lb035q02_of_match[] = {

View File

@ -266,14 +266,12 @@ static int lg4573_probe(struct spi_device *spi)
return 0;
}
static int lg4573_remove(struct spi_device *spi)
static void lg4573_remove(struct spi_device *spi)
{
struct lg4573 *ctx = spi_get_drvdata(spi);
lg4573_display_off(ctx);
drm_panel_remove(&ctx->panel);
return 0;
}
static const struct of_device_id lg4573_of_match[] = {

View File

@ -212,15 +212,13 @@ static int nl8048_probe(struct spi_device *spi)
return 0;
}
static int nl8048_remove(struct spi_device *spi)
static void nl8048_remove(struct spi_device *spi)
{
struct nl8048_panel *lcd = spi_get_drvdata(spi);
drm_panel_remove(&lcd->panel);
drm_panel_disable(&lcd->panel);
drm_panel_unprepare(&lcd->panel);
return 0;
}
static const struct of_device_id nl8048_of_match[] = {

View File

@ -292,7 +292,7 @@ static int nt39016_probe(struct spi_device *spi)
return 0;
}
static int nt39016_remove(struct spi_device *spi)
static void nt39016_remove(struct spi_device *spi)
{
struct nt39016 *panel = spi_get_drvdata(spi);
@ -300,8 +300,6 @@ static int nt39016_remove(struct spi_device *spi)
nt39016_disable(&panel->drm_panel);
nt39016_unprepare(&panel->drm_panel);
return 0;
}
static const struct drm_display_mode kd035g6_display_modes[] = {

View File

@ -314,12 +314,11 @@ static int db7430_probe(struct spi_device *spi)
return 0;
}
static int db7430_remove(struct spi_device *spi)
static void db7430_remove(struct spi_device *spi)
{
struct db7430 *db = spi_get_drvdata(spi);
drm_panel_remove(&db->panel);
return 0;
}
/*

View File

@ -358,14 +358,12 @@ static int ld9040_probe(struct spi_device *spi)
return 0;
}
static int ld9040_remove(struct spi_device *spi)
static void ld9040_remove(struct spi_device *spi)
{
struct ld9040 *ctx = spi_get_drvdata(spi);
ld9040_power_off(ctx);
drm_panel_remove(&ctx->panel);
return 0;
}
static const struct of_device_id ld9040_of_match[] = {

View File

@ -291,12 +291,11 @@ static int s6d27a1_probe(struct spi_device *spi)
return 0;
}
static int s6d27a1_remove(struct spi_device *spi)
static void s6d27a1_remove(struct spi_device *spi)
{
struct s6d27a1 *ctx = spi_get_drvdata(spi);
drm_panel_remove(&ctx->panel);
return 0;
}
static const struct of_device_id s6d27a1_match[] = {

View File

@ -62,10 +62,9 @@ static int s6e63m0_spi_probe(struct spi_device *spi)
s6e63m0_spi_dcs_write, false);
}
static int s6e63m0_spi_remove(struct spi_device *spi)
static void s6e63m0_spi_remove(struct spi_device *spi)
{
s6e63m0_remove(&spi->dev);
return 0;
}
static const struct of_device_id s6e63m0_spi_of_match[] = {

View File

@ -387,13 +387,11 @@ static int st7789v_probe(struct spi_device *spi)
return 0;
}
static int st7789v_remove(struct spi_device *spi)
static void st7789v_remove(struct spi_device *spi)
{
struct st7789v *ctx = spi_get_drvdata(spi);
drm_panel_remove(&ctx->panel);
return 0;
}
static const struct of_device_id st7789v_of_match[] = {

View File

@ -655,7 +655,7 @@ static int acx565akm_probe(struct spi_device *spi)
return 0;
}
static int acx565akm_remove(struct spi_device *spi)
static void acx565akm_remove(struct spi_device *spi)
{
struct acx565akm_panel *lcd = spi_get_drvdata(spi);
@ -666,8 +666,6 @@ static int acx565akm_remove(struct spi_device *spi)
drm_panel_disable(&lcd->panel);
drm_panel_unprepare(&lcd->panel);
return 0;
}
static const struct of_device_id acx565akm_of_match[] = {

View File

@ -350,15 +350,13 @@ static int td028ttec1_probe(struct spi_device *spi)
return 0;
}
static int td028ttec1_remove(struct spi_device *spi)
static void td028ttec1_remove(struct spi_device *spi)
{
struct td028ttec1_panel *lcd = spi_get_drvdata(spi);
drm_panel_remove(&lcd->panel);
drm_panel_disable(&lcd->panel);
drm_panel_unprepare(&lcd->panel);
return 0;
}
static const struct of_device_id td028ttec1_of_match[] = {

View File

@ -463,7 +463,7 @@ static int td043mtea1_probe(struct spi_device *spi)
return 0;
}
static int td043mtea1_remove(struct spi_device *spi)
static void td043mtea1_remove(struct spi_device *spi)
{
struct td043mtea1_panel *lcd = spi_get_drvdata(spi);
@ -472,8 +472,6 @@ static int td043mtea1_remove(struct spi_device *spi)
drm_panel_unprepare(&lcd->panel);
sysfs_remove_group(&spi->dev.kobj, &td043mtea1_attr_group);
return 0;
}
static const struct of_device_id td043mtea1_of_match[] = {

View File

@ -450,12 +450,11 @@ static int tpg110_probe(struct spi_device *spi)
return 0;
}
static int tpg110_remove(struct spi_device *spi)
static void tpg110_remove(struct spi_device *spi)
{
struct tpg110 *tpg = spi_get_drvdata(spi);
drm_panel_remove(&tpg->panel);
return 0;
}
static const struct of_device_id tpg110_match[] = {

View File

@ -407,12 +407,11 @@ static int ws2401_probe(struct spi_device *spi)
return 0;
}
static int ws2401_remove(struct spi_device *spi)
static void ws2401_remove(struct spi_device *spi)
{
struct ws2401 *ws = spi_get_drvdata(spi);
drm_panel_remove(&ws->panel);
return 0;
}
/*

View File

@ -263,14 +263,12 @@ static int hx8357d_probe(struct spi_device *spi)
return 0;
}
static int hx8357d_remove(struct spi_device *spi)
static void hx8357d_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void hx8357d_shutdown(struct spi_device *spi)

View File

@ -193,14 +193,12 @@ static int ili9163_probe(struct spi_device *spi)
return 0;
}
static int ili9163_remove(struct spi_device *spi)
static void ili9163_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void ili9163_shutdown(struct spi_device *spi)

View File

@ -411,14 +411,12 @@ static int ili9225_probe(struct spi_device *spi)
return 0;
}
static int ili9225_remove(struct spi_device *spi)
static void ili9225_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void ili9225_shutdown(struct spi_device *spi)

View File

@ -225,14 +225,12 @@ static int ili9341_probe(struct spi_device *spi)
return 0;
}
static int ili9341_remove(struct spi_device *spi)
static void ili9341_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void ili9341_shutdown(struct spi_device *spi)

View File

@ -243,14 +243,12 @@ static int ili9486_probe(struct spi_device *spi)
return 0;
}
static int ili9486_remove(struct spi_device *spi)
static void ili9486_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void ili9486_shutdown(struct spi_device *spi)

View File

@ -233,14 +233,12 @@ static int mi0283qt_probe(struct spi_device *spi)
return 0;
}
static int mi0283qt_remove(struct spi_device *spi)
static void mi0283qt_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void mi0283qt_shutdown(struct spi_device *spi)

View File

@ -1140,14 +1140,12 @@ static int repaper_probe(struct spi_device *spi)
return 0;
}
static int repaper_remove(struct spi_device *spi)
static void repaper_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void repaper_shutdown(struct spi_device *spi)

View File

@ -360,14 +360,12 @@ static int st7586_probe(struct spi_device *spi)
return 0;
}
static int st7586_remove(struct spi_device *spi)
static void st7586_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void st7586_shutdown(struct spi_device *spi)

View File

@ -247,14 +247,12 @@ static int st7735r_probe(struct spi_device *spi)
return 0;
}
static int st7735r_remove(struct spi_device *spi)
static void st7735r_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);
drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
return 0;
}
static void st7735r_shutdown(struct spi_device *spi)

View File

@ -194,7 +194,7 @@ static int adcxx_probe(struct spi_device *spi)
return status;
}
static int adcxx_remove(struct spi_device *spi)
static void adcxx_remove(struct spi_device *spi)
{
struct adcxx *adc = spi_get_drvdata(spi);
int i;
@ -205,8 +205,6 @@ static int adcxx_remove(struct spi_device *spi)
device_remove_file(&spi->dev, &ad_input[i].dev_attr);
mutex_unlock(&adc->lock);
return 0;
}
static const struct spi_device_id adcxx_ids[] = {

View File

@ -88,10 +88,9 @@ static int adt7310_spi_probe(struct spi_device *spi)
&adt7310_spi_ops);
}
static int adt7310_spi_remove(struct spi_device *spi)
static void adt7310_spi_remove(struct spi_device *spi)
{
adt7x10_remove(&spi->dev, spi->irq);
return 0;
}
static const struct spi_device_id adt7310_id[] = {

View File

@ -254,7 +254,7 @@ static int max1111_probe(struct spi_device *spi)
return err;
}
static int max1111_remove(struct spi_device *spi)
static void max1111_remove(struct spi_device *spi)
{
struct max1111_data *data = spi_get_drvdata(spi);
@ -265,7 +265,6 @@ static int max1111_remove(struct spi_device *spi)
sysfs_remove_group(&spi->dev.kobj, &max1110_attr_group);
sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
mutex_destroy(&data->drvdata_lock);
return 0;
}
static const struct spi_device_id max1111_ids[] = {

View File

@ -100,7 +100,7 @@ static int max31722_probe(struct spi_device *spi)
return 0;
}
static int max31722_remove(struct spi_device *spi)
static void max31722_remove(struct spi_device *spi)
{
struct max31722_data *data = spi_get_drvdata(spi);
int ret;
@ -111,8 +111,6 @@ static int max31722_remove(struct spi_device *spi)
if (ret)
/* There is nothing we can do about this ... */
dev_warn(&spi->dev, "Failed to put device in stand-by mode\n");
return 0;
}
static int __maybe_unused max31722_suspend(struct device *dev)

View File

@ -87,11 +87,9 @@ static int bma400_spi_probe(struct spi_device *spi)
return bma400_probe(&spi->dev, regmap, id->name);
}
static int bma400_spi_remove(struct spi_device *spi)
static void bma400_spi_remove(struct spi_device *spi)
{
bma400_remove(&spi->dev);
return 0;
}
static const struct spi_device_id bma400_spi_ids[] = {

View File

@ -35,11 +35,9 @@ static int bmc150_accel_probe(struct spi_device *spi)
true);
}
static int bmc150_accel_remove(struct spi_device *spi)
static void bmc150_accel_remove(struct spi_device *spi)
{
bmc150_accel_core_remove(&spi->dev);
return 0;
}
static const struct acpi_device_id bmc150_accel_acpi_match[] = {

View File

@ -56,11 +56,9 @@ static int bmi088_accel_probe(struct spi_device *spi)
true);
}
static int bmi088_accel_remove(struct spi_device *spi)
static void bmi088_accel_remove(struct spi_device *spi)
{
bmi088_accel_core_remove(&spi->dev);
return 0;
}
static const struct spi_device_id bmi088_accel_id[] = {

View File

@ -32,11 +32,9 @@ static int kxsd9_spi_probe(struct spi_device *spi)
spi_get_device_id(spi)->name);
}
static int kxsd9_spi_remove(struct spi_device *spi)
static void kxsd9_spi_remove(struct spi_device *spi)
{
kxsd9_common_remove(&spi->dev);
return 0;
}
static const struct spi_device_id kxsd9_spi_id[] = {

View File

@ -22,11 +22,9 @@ static int mma7455_spi_probe(struct spi_device *spi)
return mma7455_core_probe(&spi->dev, regmap, id->name);
}
static int mma7455_spi_remove(struct spi_device *spi)
static void mma7455_spi_remove(struct spi_device *spi)
{
mma7455_core_remove(&spi->dev);
return 0;
}
static const struct spi_device_id mma7455_spi_ids[] = {

View File

@ -1524,7 +1524,7 @@ static int sca3000_stop_all_interrupts(struct sca3000_state *st)
return ret;
}
static int sca3000_remove(struct spi_device *spi)
static void sca3000_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct sca3000_state *st = iio_priv(indio_dev);
@ -1535,8 +1535,6 @@ static int sca3000_remove(struct spi_device *spi)
sca3000_stop_all_interrupts(st);
if (spi->irq)
free_irq(spi->irq, indio_dev);
return 0;
}
static const struct spi_device_id sca3000_id[] = {

View File

@ -479,7 +479,7 @@ static int ad7266_probe(struct spi_device *spi)
return ret;
}
static int ad7266_remove(struct spi_device *spi)
static void ad7266_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad7266_state *st = iio_priv(indio_dev);
@ -488,8 +488,6 @@ static int ad7266_remove(struct spi_device *spi)
iio_triggered_buffer_cleanup(indio_dev);
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
return 0;
}
static const struct spi_device_id ad7266_id[] = {

View File

@ -78,13 +78,11 @@ static int ltc2496_probe(struct spi_device *spi)
return ltc2497core_probe(dev, indio_dev);
}
static int ltc2496_remove(struct spi_device *spi)
static void ltc2496_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
ltc2497core_remove(indio_dev);
return 0;
}
static const struct of_device_id ltc2496_of_match[] = {

View File

@ -459,15 +459,13 @@ static int mcp320x_probe(struct spi_device *spi)
return ret;
}
static int mcp320x_remove(struct spi_device *spi)
static void mcp320x_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct mcp320x *adc = iio_priv(indio_dev);
iio_device_unregister(indio_dev);
regulator_disable(adc->reg);
return 0;
}
static const struct of_device_id mcp320x_dt_ids[] = {

View File

@ -321,7 +321,7 @@ static int mcp3911_probe(struct spi_device *spi)
return ret;
}
static int mcp3911_remove(struct spi_device *spi)
static void mcp3911_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct mcp3911 *adc = iio_priv(indio_dev);
@ -331,8 +331,6 @@ static int mcp3911_remove(struct spi_device *spi)
clk_disable_unprepare(adc->clki);
if (adc->vref)
regulator_disable(adc->vref);
return 0;
}
static const struct of_device_id mcp3911_dt_ids[] = {

View File

@ -503,7 +503,7 @@ static int adc12138_probe(struct spi_device *spi)
return ret;
}
static int adc12138_remove(struct spi_device *spi)
static void adc12138_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct adc12138 *adc = iio_priv(indio_dev);
@ -514,8 +514,6 @@ static int adc12138_remove(struct spi_device *spi)
regulator_disable(adc->vref_n);
regulator_disable(adc->vref_p);
clk_disable_unprepare(adc->cclk);
return 0;
}
static const struct of_device_id adc12138_dt_ids[] = {

View File

@ -662,7 +662,7 @@ static int ti_ads7950_probe(struct spi_device *spi)
return ret;
}
static int ti_ads7950_remove(struct spi_device *spi)
static void ti_ads7950_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ti_ads7950_state *st = iio_priv(indio_dev);
@ -672,8 +672,6 @@ static int ti_ads7950_remove(struct spi_device *spi)
iio_triggered_buffer_cleanup(indio_dev);
regulator_disable(st->reg);
mutex_destroy(&st->slock);
return 0;
}
static const struct spi_device_id ti_ads7950_id[] = {

View File

@ -479,7 +479,7 @@ static int ads8688_probe(struct spi_device *spi)
return ret;
}
static int ads8688_remove(struct spi_device *spi)
static void ads8688_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ads8688_state *st = iio_priv(indio_dev);
@ -489,8 +489,6 @@ static int ads8688_remove(struct spi_device *spi)
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
return 0;
}
static const struct spi_device_id ads8688_id[] = {

View File

@ -224,7 +224,7 @@ static int tlc4541_probe(struct spi_device *spi)
return ret;
}
static int tlc4541_remove(struct spi_device *spi)
static void tlc4541_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct tlc4541_state *st = iio_priv(indio_dev);
@ -232,8 +232,6 @@ static int tlc4541_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
iio_triggered_buffer_cleanup(indio_dev);
regulator_disable(st->reg);
return 0;
}
static const struct of_device_id tlc4541_dt_ids[] = {

View File

@ -298,7 +298,7 @@ static int ad8366_probe(struct spi_device *spi)
return ret;
}
static int ad8366_remove(struct spi_device *spi)
static void ad8366_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad8366_state *st = iio_priv(indio_dev);
@ -308,8 +308,6 @@ static int ad8366_remove(struct spi_device *spi)
if (!IS_ERR(reg))
regulator_disable(reg);
return 0;
}
static const struct spi_device_id ad8366_id[] = {

View File

@ -586,7 +586,7 @@ static int ssp_probe(struct spi_device *spi)
return ret;
}
static int ssp_remove(struct spi_device *spi)
static void ssp_remove(struct spi_device *spi)
{
struct ssp_data *data = spi_get_drvdata(spi);
@ -608,8 +608,6 @@ static int ssp_remove(struct spi_device *spi)
mutex_destroy(&data->pending_lock);
mfd_remove_devices(&spi->dev);
return 0;
}
#ifdef CONFIG_PM_SLEEP

View File

@ -521,7 +521,7 @@ static int ad5360_probe(struct spi_device *spi)
return ret;
}
static int ad5360_remove(struct spi_device *spi)
static void ad5360_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad5360_state *st = iio_priv(indio_dev);
@ -531,8 +531,6 @@ static int ad5360_remove(struct spi_device *spi)
kfree(indio_dev->channels);
regulator_bulk_disable(st->chip_info->num_vrefs, st->vref_reg);
return 0;
}
static const struct spi_device_id ad5360_ids[] = {

View File

@ -488,11 +488,9 @@ static int ad5380_spi_probe(struct spi_device *spi)
return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name);
}
static int ad5380_spi_remove(struct spi_device *spi)
static void ad5380_spi_remove(struct spi_device *spi)
{
ad5380_remove(&spi->dev);
return 0;
}
static const struct spi_device_id ad5380_spi_ids[] = {

View File

@ -491,11 +491,9 @@ static int ad5446_spi_probe(struct spi_device *spi)
&ad5446_spi_chip_info[id->driver_data]);
}
static int ad5446_spi_remove(struct spi_device *spi)
static void ad5446_spi_remove(struct spi_device *spi)
{
ad5446_remove(&spi->dev);
return 0;
}
static struct spi_driver ad5446_spi_driver = {

View File

@ -330,7 +330,7 @@ static int ad5449_spi_probe(struct spi_device *spi)
return ret;
}
static int ad5449_spi_remove(struct spi_device *spi)
static void ad5449_spi_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad5449 *st = iio_priv(indio_dev);
@ -338,8 +338,6 @@ static int ad5449_spi_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
regulator_bulk_disable(st->chip_info->num_channels, st->vref_reg);
return 0;
}
static const struct spi_device_id ad5449_spi_ids[] = {

View File

@ -336,7 +336,7 @@ static int ad5504_probe(struct spi_device *spi)
return ret;
}
static int ad5504_remove(struct spi_device *spi)
static void ad5504_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad5504_state *st = iio_priv(indio_dev);
@ -345,8 +345,6 @@ static int ad5504_remove(struct spi_device *spi)
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
return 0;
}
static const struct spi_device_id ad5504_id[] = {

View File

@ -130,11 +130,9 @@ static int ad5592r_spi_probe(struct spi_device *spi)
return ad5592r_probe(&spi->dev, id->name, &ad5592r_rw_ops);
}
static int ad5592r_spi_remove(struct spi_device *spi)
static void ad5592r_spi_remove(struct spi_device *spi)
{
ad5592r_remove(&spi->dev);
return 0;
}
static const struct spi_device_id ad5592r_spi_ids[] = {

View File

@ -293,7 +293,7 @@ static int ad5624r_probe(struct spi_device *spi)
return ret;
}
static int ad5624r_remove(struct spi_device *spi)
static void ad5624r_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad5624r_state *st = iio_priv(indio_dev);
@ -301,8 +301,6 @@ static int ad5624r_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
return 0;
}
static const struct spi_device_id ad5624r_id[] = {

View File

@ -95,11 +95,9 @@ static int ad5686_spi_probe(struct spi_device *spi)
ad5686_spi_write, ad5686_spi_read);
}
static int ad5686_spi_remove(struct spi_device *spi)
static void ad5686_spi_remove(struct spi_device *spi)
{
ad5686_remove(&spi->dev);
return 0;
}
static const struct spi_device_id ad5686_spi_id[] = {

View File

@ -394,7 +394,7 @@ static int ad5761_probe(struct spi_device *spi)
return ret;
}
static int ad5761_remove(struct spi_device *spi)
static void ad5761_remove(struct spi_device *spi)
{
struct iio_dev *iio_dev = spi_get_drvdata(spi);
struct ad5761_state *st = iio_priv(iio_dev);
@ -403,8 +403,6 @@ static int ad5761_remove(struct spi_device *spi)
if (!IS_ERR_OR_NULL(st->vref_reg))
regulator_disable(st->vref_reg);
return 0;
}
static const struct spi_device_id ad5761_id[] = {

View File

@ -332,7 +332,7 @@ static int ad5764_probe(struct spi_device *spi)
return ret;
}
static int ad5764_remove(struct spi_device *spi)
static void ad5764_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad5764_state *st = iio_priv(indio_dev);
@ -341,8 +341,6 @@ static int ad5764_remove(struct spi_device *spi)
if (st->chip_info->int_vref == 0)
regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg);
return 0;
}
static const struct spi_device_id ad5764_ids[] = {

View File

@ -428,7 +428,7 @@ static int ad5791_probe(struct spi_device *spi)
return ret;
}
static int ad5791_remove(struct spi_device *spi)
static void ad5791_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad5791_state *st = iio_priv(indio_dev);
@ -439,8 +439,6 @@ static int ad5791_remove(struct spi_device *spi)
if (!IS_ERR(st->reg_vss))
regulator_disable(st->reg_vss);
return 0;
}
static const struct spi_device_id ad5791_id[] = {

View File

@ -193,7 +193,7 @@ static int ad8801_probe(struct spi_device *spi)
return ret;
}
static int ad8801_remove(struct spi_device *spi)
static void ad8801_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad8801_state *state = iio_priv(indio_dev);
@ -202,8 +202,6 @@ static int ad8801_remove(struct spi_device *spi)
if (state->vrefl_reg)
regulator_disable(state->vrefl_reg);
regulator_disable(state->vrefh_reg);
return 0;
}
static const struct spi_device_id ad8801_ids[] = {

View File

@ -206,15 +206,13 @@ static int ltc1660_probe(struct spi_device *spi)
return ret;
}
static int ltc1660_remove(struct spi_device *spi)
static void ltc1660_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ltc1660_priv *priv = iio_priv(indio_dev);
iio_device_unregister(indio_dev);
regulator_disable(priv->vref_reg);
return 0;
}
static const struct of_device_id ltc1660_dt_ids[] = {

View File

@ -372,7 +372,7 @@ static int ltc2632_probe(struct spi_device *spi)
return iio_device_register(indio_dev);
}
static int ltc2632_remove(struct spi_device *spi)
static void ltc2632_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ltc2632_state *st = iio_priv(indio_dev);
@ -381,8 +381,6 @@ static int ltc2632_remove(struct spi_device *spi)
if (st->vref_reg)
regulator_disable(st->vref_reg);
return 0;
}
static const struct spi_device_id ltc2632_id[] = {

View File

@ -172,7 +172,7 @@ static int mcp4922_probe(struct spi_device *spi)
return ret;
}
static int mcp4922_remove(struct spi_device *spi)
static void mcp4922_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct mcp4922_state *state;
@ -180,8 +180,6 @@ static int mcp4922_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
state = iio_priv(indio_dev);
regulator_disable(state->vref_reg);
return 0;
}
static const struct spi_device_id mcp4922_id[] = {

View File

@ -313,7 +313,7 @@ static int ti_dac_probe(struct spi_device *spi)
return ret;
}
static int ti_dac_remove(struct spi_device *spi)
static void ti_dac_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
@ -321,8 +321,6 @@ static int ti_dac_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
mutex_destroy(&ti_dac->lock);
regulator_disable(ti_dac->vref);
return 0;
}
static const struct of_device_id ti_dac_of_id[] = {

View File

@ -292,7 +292,7 @@ static int ti_dac_probe(struct spi_device *spi)
return ret;
}
static int ti_dac_remove(struct spi_device *spi)
static void ti_dac_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
@ -300,7 +300,6 @@ static int ti_dac_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
mutex_destroy(&ti_dac->lock);
regulator_disable(ti_dac->vref);
return 0;
}
static const struct of_device_id ti_dac_of_id[] = {

View File

@ -589,7 +589,7 @@ static int adf4350_probe(struct spi_device *spi)
return ret;
}
static int adf4350_remove(struct spi_device *spi)
static void adf4350_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct adf4350_state *st = iio_priv(indio_dev);
@ -604,8 +604,6 @@ static int adf4350_remove(struct spi_device *spi)
if (!IS_ERR(reg))
regulator_disable(reg);
return 0;
}
static const struct of_device_id adf4350_of_match[] = {

View File

@ -27,11 +27,9 @@ static int bmg160_spi_probe(struct spi_device *spi)
return bmg160_core_probe(&spi->dev, regmap, spi->irq, id->name);
}
static int bmg160_spi_remove(struct spi_device *spi)
static void bmg160_spi_remove(struct spi_device *spi)
{
bmg160_core_remove(&spi->dev);
return 0;
}
static const struct spi_device_id bmg160_spi_id[] = {

View File

@ -34,11 +34,9 @@ static int fxas21002c_spi_probe(struct spi_device *spi)
return fxas21002c_core_probe(&spi->dev, regmap, spi->irq, id->name);
}
static int fxas21002c_spi_remove(struct spi_device *spi)
static void fxas21002c_spi_remove(struct spi_device *spi)
{
fxas21002c_core_remove(&spi->dev);
return 0;
}
static const struct spi_device_id fxas21002c_spi_id[] = {

View File

@ -570,7 +570,7 @@ static int afe4403_probe(struct spi_device *spi)
return ret;
}
static int afe4403_remove(struct spi_device *spi)
static void afe4403_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct afe4403_data *afe = iio_priv(indio_dev);
@ -586,8 +586,6 @@ static int afe4403_remove(struct spi_device *spi)
ret = regulator_disable(afe->regulator);
if (ret)
dev_warn(afe->dev, "Unable to disable regulator\n");
return 0;
}
static const struct spi_device_id afe4403_ids[] = {

View File

@ -29,11 +29,9 @@ static int bmc150_magn_spi_probe(struct spi_device *spi)
return bmc150_magn_probe(&spi->dev, regmap, spi->irq, id->name);
}
static int bmc150_magn_spi_remove(struct spi_device *spi)
static void bmc150_magn_spi_remove(struct spi_device *spi)
{
bmc150_magn_remove(&spi->dev);
return 0;
}
static const struct spi_device_id bmc150_magn_spi_id[] = {

View File

@ -74,11 +74,9 @@ static int hmc5843_spi_probe(struct spi_device *spi)
id->driver_data, id->name);
}
static int hmc5843_spi_remove(struct spi_device *spi)
static void hmc5843_spi_remove(struct spi_device *spi)
{
hmc5843_common_remove(&spi->dev);
return 0;
}
static const struct spi_device_id hmc5843_id[] = {

View File

@ -112,7 +112,7 @@ static int max5487_spi_probe(struct spi_device *spi)
return iio_device_register(indio_dev);
}
static int max5487_spi_remove(struct spi_device *spi)
static void max5487_spi_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
int ret;
@ -123,8 +123,6 @@ static int max5487_spi_remove(struct spi_device *spi)
ret = max5487_write_cmd(spi, MAX5487_COPY_AB_TO_NV);
if (ret)
dev_warn(&spi->dev, "Failed to save wiper regs to NV regs\n");
return 0;
}
static const struct spi_device_id max5487_id[] = {

View File

@ -107,11 +107,9 @@ static int ms5611_spi_probe(struct spi_device *spi)
spi_get_device_id(spi)->driver_data);
}
static int ms5611_spi_remove(struct spi_device *spi)
static void ms5611_spi_remove(struct spi_device *spi)
{
ms5611_remove(spi_get_drvdata(spi));
return 0;
}
static const struct of_device_id ms5611_spi_matches[] = {

View File

@ -57,11 +57,9 @@ static int zpa2326_probe_spi(struct spi_device *spi)
spi->irq, ZPA2326_DEVICE_ID, regmap);
}
static int zpa2326_remove_spi(struct spi_device *spi)
static void zpa2326_remove_spi(struct spi_device *spi)
{
zpa2326_remove(&spi->dev);
return 0;
}
static const struct spi_device_id zpa2326_spi_ids[] = {

View File

@ -1858,7 +1858,7 @@ static void applespi_drain_reads(struct applespi_data *applespi)
spin_unlock_irqrestore(&applespi->cmd_msg_lock, flags);
}
static int applespi_remove(struct spi_device *spi)
static void applespi_remove(struct spi_device *spi)
{
struct applespi_data *applespi = spi_get_drvdata(spi);
@ -1871,8 +1871,6 @@ static int applespi_remove(struct spi_device *spi)
applespi_drain_reads(applespi);
debugfs_remove_recursive(applespi->debugfs_root);
return 0;
}
static void applespi_shutdown(struct spi_device *spi)

View File

@ -87,13 +87,11 @@ static int adxl34x_spi_probe(struct spi_device *spi)
return 0;
}
static int adxl34x_spi_remove(struct spi_device *spi)
static void adxl34x_spi_remove(struct spi_device *spi)
{
struct adxl34x *ac = spi_get_drvdata(spi);
adxl34x_remove(ac);
return 0;
}
static int __maybe_unused adxl34x_spi_suspend(struct device *dev)

View File

@ -1411,13 +1411,11 @@ static int ads7846_probe(struct spi_device *spi)
return 0;
}
static int ads7846_remove(struct spi_device *spi)
static void ads7846_remove(struct spi_device *spi)
{
struct ads7846 *ts = spi_get_drvdata(spi);
ads7846_stop(ts);
return 0;
}
static struct spi_driver ads7846_driver = {

View File

@ -164,12 +164,10 @@ static int cyttsp4_spi_probe(struct spi_device *spi)
return PTR_ERR_OR_ZERO(ts);
}
static int cyttsp4_spi_remove(struct spi_device *spi)
static void cyttsp4_spi_remove(struct spi_device *spi)
{
struct cyttsp4 *ts = spi_get_drvdata(spi);
cyttsp4_remove(ts);
return 0;
}
static struct spi_driver cyttsp4_spi_driver = {

View File

@ -64,11 +64,9 @@ static int tsc2005_probe(struct spi_device *spi)
tsc2005_cmd);
}
static int tsc2005_remove(struct spi_device *spi)
static void tsc2005_remove(struct spi_device *spi)
{
tsc200x_remove(&spi->dev);
return 0;
}
#ifdef CONFIG_OF

View File

@ -266,14 +266,12 @@ static int cr0014114_probe(struct spi_device *spi)
return 0;
}
static int cr0014114_remove(struct spi_device *spi)
static void cr0014114_remove(struct spi_device *spi)
{
struct cr0014114 *priv = spi_get_drvdata(spi);
cancel_delayed_work_sync(&priv->work);
mutex_destroy(&priv->lock);
return 0;
}
static const struct of_device_id cr0014114_dt_ids[] = {

View File

@ -85,15 +85,13 @@ static int dac124s085_probe(struct spi_device *spi)
return ret;
}
static int dac124s085_remove(struct spi_device *spi)
static void dac124s085_remove(struct spi_device *spi)
{
struct dac124s085 *dac = spi_get_drvdata(spi);
int i;
for (i = 0; i < ARRAY_SIZE(dac->leds); i++)
led_classdev_unregister(&dac->leds[i].ldev);
return 0;
}
static struct spi_driver dac124s085_driver = {

View File

@ -315,13 +315,11 @@ static int el15203000_probe(struct spi_device *spi)
return el15203000_probe_dt(priv);
}
static int el15203000_remove(struct spi_device *spi)
static void el15203000_remove(struct spi_device *spi)
{
struct el15203000 *priv = spi_get_drvdata(spi);
mutex_destroy(&priv->lock);
return 0;
}
static const struct of_device_id el15203000_dt_ids[] = {

View File

@ -130,13 +130,11 @@ static int spi_byte_probe(struct spi_device *spi)
return 0;
}
static int spi_byte_remove(struct spi_device *spi)
static void spi_byte_remove(struct spi_device *spi)
{
struct spi_byte_led *led = spi_get_drvdata(spi);
mutex_destroy(&led->mutex);
return 0;
}
static struct spi_driver spi_byte_driver = {

View File

@ -625,7 +625,7 @@ cxd2880_spi_probe(struct spi_device *spi)
return ret;
}
static int
static void
cxd2880_spi_remove(struct spi_device *spi)
{
struct cxd2880_dvb_spi *dvb_spi = spi_get_drvdata(spi);
@ -643,8 +643,6 @@ cxd2880_spi_remove(struct spi_device *spi)
kfree(dvb_spi);
pr_info("cxd2880_spi remove ok.\n");
return 0;
}
static const struct spi_device_id cxd2880_spi_id[] = {

View File

@ -458,13 +458,11 @@ static int gs_probe(struct spi_device *spi)
return ret;
}
static int gs_remove(struct spi_device *spi)
static void gs_remove(struct spi_device *spi)
{
struct v4l2_subdev *sd = spi_get_drvdata(spi);
v4l2_device_unregister_subdev(sd);
return 0;
}
static struct spi_driver gs_driver = {

View File

@ -472,7 +472,7 @@ static int msi001_probe(struct spi_device *spi)
return ret;
}
static int msi001_remove(struct spi_device *spi)
static void msi001_remove(struct spi_device *spi)
{
struct v4l2_subdev *sd = spi_get_drvdata(spi);
struct msi001_dev *dev = sd_to_msi001_dev(sd);
@ -486,7 +486,6 @@ static int msi001_remove(struct spi_device *spi)
v4l2_device_unregister_subdev(&dev->sd);
v4l2_ctrl_handler_free(&dev->hdl);
kfree(dev);
return 0;
}
static const struct spi_device_id msi001_id_table[] = {

View File

@ -206,13 +206,11 @@ static int arizona_spi_probe(struct spi_device *spi)
return arizona_dev_init(arizona);
}
static int arizona_spi_remove(struct spi_device *spi)
static void arizona_spi_remove(struct spi_device *spi)
{
struct arizona *arizona = spi_get_drvdata(spi);
arizona_dev_exit(arizona);
return 0;
}
static const struct spi_device_id arizona_spi_ids[] = {

View File

@ -55,12 +55,11 @@ static int da9052_spi_probe(struct spi_device *spi)
return da9052_device_init(da9052, id->driver_data);
}
static int da9052_spi_remove(struct spi_device *spi)
static void da9052_spi_remove(struct spi_device *spi)
{
struct da9052 *da9052 = spi_get_drvdata(spi);
da9052_device_exit(da9052);
return 0;
}
static const struct spi_device_id da9052_spi_id[] = {

View File

@ -392,7 +392,7 @@ static int pcap_add_subdev(struct pcap_chip *pcap,
return ret;
}
static int ezx_pcap_remove(struct spi_device *spi)
static void ezx_pcap_remove(struct spi_device *spi)
{
struct pcap_chip *pcap = spi_get_drvdata(spi);
unsigned long flags;
@ -412,8 +412,6 @@ static int ezx_pcap_remove(struct spi_device *spi)
irq_set_chip_and_handler(i, NULL, NULL);
destroy_workqueue(pcap->workqueue);
return 0;
}
static int ezx_pcap_probe(struct spi_device *spi)

View File

@ -112,13 +112,11 @@ static int madera_spi_probe(struct spi_device *spi)
return madera_dev_init(madera);
}
static int madera_spi_remove(struct spi_device *spi)
static void madera_spi_remove(struct spi_device *spi)
{
struct madera *madera = spi_get_drvdata(spi);
madera_dev_exit(madera);
return 0;
}
static const struct spi_device_id madera_spi_ids[] = {

View File

@ -166,10 +166,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
return mc13xxx_common_init(&spi->dev);
}
static int mc13xxx_spi_remove(struct spi_device *spi)
static void mc13xxx_spi_remove(struct spi_device *spi)
{
mc13xxx_common_exit(&spi->dev);
return 0;
}
static struct spi_driver mc13xxx_spi_driver = {

View File

@ -220,13 +220,11 @@ static int rsmu_spi_probe(struct spi_device *client)
return rsmu_core_init(rsmu);
}
static int rsmu_spi_remove(struct spi_device *client)
static void rsmu_spi_remove(struct spi_device *client)
{
struct rsmu_ddata *rsmu = spi_get_drvdata(client);
rsmu_core_exit(rsmu);
return 0;
}
static const struct spi_device_id rsmu_spi_id[] = {

Some files were not shown because too many files have changed in this diff Show More