Skip to content

Commit

Permalink
Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap…
Browse files Browse the repository at this point in the history
…-uwire', 'spi/topic/owner', 'spi/topic/pxa' and 'spi/topic/pxa2xx' into spi-next
  • Loading branch information
broonie committed Nov 4, 2015
6 parents fc57905 + 76f67ea + 160f8d0 + 3821a06 + 54bf450 + 0db6421 commit 4c84518
Show file tree
Hide file tree
Showing 211 changed files with 181 additions and 342 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-u300/dummyspichip.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ static const struct of_device_id pl022_dummy_dt_match[] = {
static struct spi_driver pl022_dummy_driver = {
.driver = {
.name = "spi-dummy",
.owner = THIS_MODULE,
.of_match_table = pl022_dummy_dt_match,
},
.probe = pl022_dummy_probe,
Expand Down
1 change: 0 additions & 1 deletion arch/mips/txx9/generic/spi_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ static int __init early_seeprom_probe(struct spi_device *spi)
static struct spi_driver early_seeprom_driver __initdata = {
.driver = {
.name = "at25",
.owner = THIS_MODULE,
},
.probe = early_seeprom_probe,
};
Expand Down
1 change: 0 additions & 1 deletion drivers/char/tpm/st33zp24/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@ static SIMPLE_DEV_PM_OPS(st33zp24_spi_ops, st33zp24_pm_suspend,

static struct spi_driver tpm_st33_spi_driver = {
.driver = {
.owner = THIS_MODULE,
.name = TPM_ST33_SPI,
.pm = &st33zp24_spi_ops,
.of_match_table = of_match_ptr(of_st33zp24_spi_match),
Expand Down
1 change: 0 additions & 1 deletion drivers/gpio/gpio-74x164.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ MODULE_DEVICE_TABLE(of, gen_74x164_dt_ids);
static struct spi_driver gen_74x164_driver = {
.driver = {
.name = "74x164",
.owner = THIS_MODULE,
.of_match_table = gen_74x164_dt_ids,
},
.probe = gen_74x164_probe,
Expand Down
1 change: 0 additions & 1 deletion drivers/gpio/gpio-max7301.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ MODULE_DEVICE_TABLE(spi, max7301_id);
static struct spi_driver max7301_driver = {
.driver = {
.name = "max7301",
.owner = THIS_MODULE,
},
.probe = max7301_probe,
.remove = max7301_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/gpio/gpio-mc33880.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ static int mc33880_remove(struct spi_device *spi)
static struct spi_driver mc33880_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
},
.probe = mc33880_probe,
.remove = mc33880_remove,
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpio/gpio-mcp23s08.c
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,6 @@ MODULE_DEVICE_TABLE(i2c, mcp230xx_id);
static struct i2c_driver mcp230xx_driver = {
.driver = {
.name = "mcp230xx",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(mcp23s08_i2c_of_match),
},
.probe = mcp230xx_probe,
Expand Down Expand Up @@ -1021,7 +1020,6 @@ static struct spi_driver mcp23s08_driver = {
.id_table = mcp23s08_ids,
.driver = {
.name = "mcp23s08",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(mcp23s08_spi_of_match),
},
};
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/panel/panel-lg-lg4573.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ static struct spi_driver lg4573_driver = {
.remove = lg4573_remove,
.driver = {
.name = "lg4573",
.owner = THIS_MODULE,
.of_match_table = lg4573_of_match,
},
};
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/panel/panel-samsung-ld9040.c
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,6 @@ static struct spi_driver ld9040_driver = {
.remove = ld9040_remove,
.driver = {
.name = "panel-samsung-ld9040",
.owner = THIS_MODULE,
.of_match_table = ld9040_of_match,
},
};
Expand Down
1 change: 0 additions & 1 deletion drivers/hwmon/ad7314.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ MODULE_DEVICE_TABLE(spi, ad7314_id);
static struct spi_driver ad7314_driver = {
.driver = {
.name = "ad7314",
.owner = THIS_MODULE,
},
.probe = ad7314_probe,
.remove = ad7314_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/hwmon/adcxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ MODULE_DEVICE_TABLE(spi, adcxx_ids);
static struct spi_driver adcxx_driver = {
.driver = {
.name = "adcxx",
.owner = THIS_MODULE,
},
.id_table = adcxx_ids,
.probe = adcxx_probe,
Expand Down
1 change: 0 additions & 1 deletion drivers/hwmon/ads7871.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ static int ads7871_remove(struct spi_device *spi)
static struct spi_driver ads7871_driver = {
.driver = {
.name = DEVICE_NAME,
.owner = THIS_MODULE,
},

.probe = ads7871_probe,
Expand Down
1 change: 0 additions & 1 deletion drivers/hwmon/adt7310.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ MODULE_DEVICE_TABLE(spi, adt7310_id);
static struct spi_driver adt7310_driver = {
.driver = {
.name = "adt7310",
.owner = THIS_MODULE,
.pm = ADT7X10_DEV_PM_OPS,
},
.probe = adt7310_spi_probe,
Expand Down
1 change: 0 additions & 1 deletion drivers/hwmon/lm70.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ MODULE_DEVICE_TABLE(spi, lm70_ids);
static struct spi_driver lm70_driver = {
.driver = {
.name = "lm70",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(lm70_of_ids),
},
.id_table = lm70_ids,
Expand Down
1 change: 0 additions & 1 deletion drivers/hwmon/max1111.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ MODULE_DEVICE_TABLE(spi, max1111_ids);
static struct spi_driver max1111_driver = {
.driver = {
.name = "max1111",
.owner = THIS_MODULE,
},
.id_table = max1111_ids,
.probe = max1111_probe,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/accel/kxsd9.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ MODULE_DEVICE_TABLE(spi, kxsd9_id);
static struct spi_driver kxsd9_driver = {
.driver = {
.name = "kxsd9",
.owner = THIS_MODULE,
},
.probe = kxsd9_probe,
.remove = kxsd9_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/accel/st_accel_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ MODULE_DEVICE_TABLE(spi, st_accel_id_table);

static struct spi_driver st_accel_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "st-accel-spi",
},
.probe = st_accel_spi_probe,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ad7266.c
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@ MODULE_DEVICE_TABLE(spi, ad7266_id);
static struct spi_driver ad7266_driver = {
.driver = {
.name = "ad7266",
.owner = THIS_MODULE,
},
.probe = ad7266_probe,
.remove = ad7266_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ad7298.c
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,6 @@ MODULE_DEVICE_TABLE(spi, ad7298_id);
static struct spi_driver ad7298_driver = {
.driver = {
.name = "ad7298",
.owner = THIS_MODULE,
},
.probe = ad7298_probe,
.remove = ad7298_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ad7476.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ MODULE_DEVICE_TABLE(spi, ad7476_id);
static struct spi_driver ad7476_driver = {
.driver = {
.name = "ad7476",
.owner = THIS_MODULE,
},
.probe = ad7476_probe,
.remove = ad7476_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ad7791.c
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,6 @@ MODULE_DEVICE_TABLE(spi, ad7791_spi_ids);
static struct spi_driver ad7791_driver = {
.driver = {
.name = "ad7791",
.owner = THIS_MODULE,
},
.probe = ad7791_probe,
.remove = ad7791_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ad7793.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,6 @@ MODULE_DEVICE_TABLE(spi, ad7793_id);
static struct spi_driver ad7793_driver = {
.driver = {
.name = "ad7793",
.owner = THIS_MODULE,
},
.probe = ad7793_probe,
.remove = ad7793_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ad7887.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ MODULE_DEVICE_TABLE(spi, ad7887_id);
static struct spi_driver ad7887_driver = {
.driver = {
.name = "ad7887",
.owner = THIS_MODULE,
},
.probe = ad7887_probe,
.remove = ad7887_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ad7923.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ MODULE_DEVICE_TABLE(spi, ad7923_id);
static struct spi_driver ad7923_driver = {
.driver = {
.name = "ad7923",
.owner = THIS_MODULE,
},
.probe = ad7923_probe,
.remove = ad7923_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/max1027.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,6 @@ static int max1027_remove(struct spi_device *spi)
static struct spi_driver max1027_driver = {
.driver = {
.name = "max1027",
.owner = THIS_MODULE,
},
.probe = max1027_probe,
.remove = max1027_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/mcp320x.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ MODULE_DEVICE_TABLE(spi, mcp320x_id);
static struct spi_driver mcp320x_driver = {
.driver = {
.name = "mcp320x",
.owner = THIS_MODULE,
},
.probe = mcp320x_probe,
.remove = mcp320x_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/adc/ti-adc128s052.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ MODULE_DEVICE_TABLE(spi, adc128_id);
static struct spi_driver adc128_driver = {
.driver = {
.name = "adc128s052",
.owner = THIS_MODULE,
},
.probe = adc128_probe,
.remove = adc128_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/amplifiers/ad8366.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ static const struct spi_device_id ad8366_id[] = {
static struct spi_driver ad8366_driver = {
.driver = {
.name = KBUILD_MODNAME,
.owner = THIS_MODULE,
},
.probe = ad8366_probe,
.remove = ad8366_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/common/ssp_sensors/ssp_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,6 @@ static struct spi_driver ssp_driver = {
.remove = ssp_remove,
.driver = {
.pm = &ssp_pm_ops,
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(ssp_of_match),
.name = "sensorhub"
},
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5064.c
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,6 @@ MODULE_DEVICE_TABLE(spi, ad5064_spi_ids);
static struct spi_driver ad5064_spi_driver = {
.driver = {
.name = "ad5064",
.owner = THIS_MODULE,
},
.probe = ad5064_spi_probe,
.remove = ad5064_spi_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5360.c
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,6 @@ MODULE_DEVICE_TABLE(spi, ad5360_ids);
static struct spi_driver ad5360_driver = {
.driver = {
.name = "ad5360",
.owner = THIS_MODULE,
},
.probe = ad5360_probe,
.remove = ad5360_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5380.c
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,6 @@ MODULE_DEVICE_TABLE(spi, ad5380_spi_ids);
static struct spi_driver ad5380_spi_driver = {
.driver = {
.name = "ad5380",
.owner = THIS_MODULE,
},
.probe = ad5380_spi_probe,
.remove = ad5380_spi_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5421.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@ static int ad5421_probe(struct spi_device *spi)
static struct spi_driver ad5421_driver = {
.driver = {
.name = "ad5421",
.owner = THIS_MODULE,
},
.probe = ad5421_probe,
};
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5446.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@ static int ad5446_spi_remove(struct spi_device *spi)
static struct spi_driver ad5446_spi_driver = {
.driver = {
.name = "ad5446",
.owner = THIS_MODULE,
},
.probe = ad5446_spi_probe,
.remove = ad5446_spi_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5449.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ MODULE_DEVICE_TABLE(spi, ad5449_spi_ids);
static struct spi_driver ad5449_spi_driver = {
.driver = {
.name = "ad5449",
.owner = THIS_MODULE,
},
.probe = ad5449_spi_probe,
.remove = ad5449_spi_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5504.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ MODULE_DEVICE_TABLE(spi, ad5504_id);
static struct spi_driver ad5504_driver = {
.driver = {
.name = "ad5504",
.owner = THIS_MODULE,
},
.probe = ad5504_probe,
.remove = ad5504_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5624r_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ MODULE_DEVICE_TABLE(spi, ad5624r_id);
static struct spi_driver ad5624r_driver = {
.driver = {
.name = "ad5624r",
.owner = THIS_MODULE,
},
.probe = ad5624r_probe,
.remove = ad5624r_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5686.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ MODULE_DEVICE_TABLE(spi, ad5686_id);
static struct spi_driver ad5686_driver = {
.driver = {
.name = "ad5686",
.owner = THIS_MODULE,
},
.probe = ad5686_probe,
.remove = ad5686_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5755.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@ MODULE_DEVICE_TABLE(spi, ad5755_id);
static struct spi_driver ad5755_driver = {
.driver = {
.name = "ad5755",
.owner = THIS_MODULE,
},
.probe = ad5755_probe,
.id_table = ad5755_id,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5764.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ MODULE_DEVICE_TABLE(spi, ad5764_ids);
static struct spi_driver ad5764_driver = {
.driver = {
.name = "ad5764",
.owner = THIS_MODULE,
},
.probe = ad5764_probe,
.remove = ad5764_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad5791.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ MODULE_DEVICE_TABLE(spi, ad5791_id);
static struct spi_driver ad5791_driver = {
.driver = {
.name = "ad5791",
.owner = THIS_MODULE,
},
.probe = ad5791_probe,
.remove = ad5791_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/ad7303.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ MODULE_DEVICE_TABLE(spi, ad7303_spi_ids);
static struct spi_driver ad7303_driver = {
.driver = {
.name = "ad7303",
.owner = THIS_MODULE,
},
.probe = ad7303_probe,
.remove = ad7303_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/dac/mcp4922.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ MODULE_DEVICE_TABLE(spi, mcp4922_id);
static struct spi_driver mcp4922_driver = {
.driver = {
.name = "mcp4922",
.owner = THIS_MODULE,
},
.probe = mcp4922_probe,
.remove = mcp4922_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/frequency/ad9523.c
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,6 @@ MODULE_DEVICE_TABLE(spi, ad9523_id);
static struct spi_driver ad9523_driver = {
.driver = {
.name = "ad9523",
.owner = THIS_MODULE,
},
.probe = ad9523_probe,
.remove = ad9523_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/frequency/adf4350.c
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ static const struct spi_device_id adf4350_id[] = {
static struct spi_driver adf4350_driver = {
.driver = {
.name = "adf4350",
.owner = THIS_MODULE,
},
.probe = adf4350_probe,
.remove = adf4350_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/gyro/adis16080.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ MODULE_DEVICE_TABLE(spi, adis16080_ids);
static struct spi_driver adis16080_driver = {
.driver = {
.name = "adis16080",
.owner = THIS_MODULE,
},
.probe = adis16080_probe,
.remove = adis16080_remove,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/gyro/adis16130.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ static int adis16130_probe(struct spi_device *spi)
static struct spi_driver adis16130_driver = {
.driver = {
.name = "adis16130",
.owner = THIS_MODULE,
},
.probe = adis16130_probe,
};
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/gyro/adis16136.c
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,6 @@ MODULE_DEVICE_TABLE(spi, adis16136_ids);
static struct spi_driver adis16136_driver = {
.driver = {
.name = "adis16136",
.owner = THIS_MODULE,
},
.id_table = adis16136_ids,
.probe = adis16136_probe,
Expand Down
1 change: 0 additions & 1 deletion drivers/iio/gyro/adis16260.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ MODULE_DEVICE_TABLE(spi, adis16260_id);
static struct spi_driver adis16260_driver = {
.driver = {
.name = "adis16260",
.owner = THIS_MODULE,
},
.probe = adis16260_probe,
.remove = adis16260_remove,
Expand Down
Loading

0 comments on commit 4c84518

Please sign in to comment.