Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi...
authorMark Brown <broonie@kernel.org>
Wed, 4 Nov 2015 11:02:12 +0000 (11:02 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Nov 2015 11:02:12 +0000 (11:02 +0000)
211 files changed:
arch/arm/mach-u300/dummyspichip.c
arch/mips/txx9/generic/spi_eeprom.c
drivers/char/tpm/st33zp24/spi.c
drivers/gpio/gpio-74x164.c
drivers/gpio/gpio-max7301.c
drivers/gpio/gpio-mc33880.c
drivers/gpio/gpio-mcp23s08.c
drivers/gpu/drm/panel/panel-lg-lg4573.c
drivers/gpu/drm/panel/panel-samsung-ld9040.c
drivers/hwmon/ad7314.c
drivers/hwmon/adcxx.c
drivers/hwmon/ads7871.c
drivers/hwmon/adt7310.c
drivers/hwmon/lm70.c
drivers/hwmon/max1111.c
drivers/iio/accel/kxsd9.c
drivers/iio/accel/st_accel_spi.c
drivers/iio/adc/ad7266.c
drivers/iio/adc/ad7298.c
drivers/iio/adc/ad7476.c
drivers/iio/adc/ad7791.c
drivers/iio/adc/ad7793.c
drivers/iio/adc/ad7887.c
drivers/iio/adc/ad7923.c
drivers/iio/adc/max1027.c
drivers/iio/adc/mcp320x.c
drivers/iio/adc/ti-adc128s052.c
drivers/iio/amplifiers/ad8366.c
drivers/iio/common/ssp_sensors/ssp_dev.c
drivers/iio/dac/ad5064.c
drivers/iio/dac/ad5360.c
drivers/iio/dac/ad5380.c
drivers/iio/dac/ad5421.c
drivers/iio/dac/ad5446.c
drivers/iio/dac/ad5449.c
drivers/iio/dac/ad5504.c
drivers/iio/dac/ad5624r_spi.c
drivers/iio/dac/ad5686.c
drivers/iio/dac/ad5755.c
drivers/iio/dac/ad5764.c
drivers/iio/dac/ad5791.c
drivers/iio/dac/ad7303.c
drivers/iio/dac/mcp4922.c
drivers/iio/frequency/ad9523.c
drivers/iio/frequency/adf4350.c
drivers/iio/gyro/adis16080.c
drivers/iio/gyro/adis16130.c
drivers/iio/gyro/adis16136.c
drivers/iio/gyro/adis16260.c
drivers/iio/gyro/adxrs450.c
drivers/iio/gyro/st_gyro_spi.c
drivers/iio/imu/adis16400_core.c
drivers/iio/imu/adis16480.c
drivers/iio/magnetometer/st_magn_spi.c
drivers/iio/pressure/ms5611_spi.c
drivers/iio/pressure/st_pressure_spi.c
drivers/iio/proximity/as3935.c
drivers/input/misc/ad714x-spi.c
drivers/input/misc/adxl34x-spi.c
drivers/input/touchscreen/ad7877.c
drivers/input/touchscreen/ad7879-spi.c
drivers/input/touchscreen/ads7846.c
drivers/input/touchscreen/cyttsp4_spi.c
drivers/input/touchscreen/cyttsp_spi.c
drivers/input/touchscreen/tsc2005.c
drivers/leds/leds-dac124s085.c
drivers/media/i2c/s5c73m3/s5c73m3-spi.c
drivers/media/tuners/msi001.c
drivers/mfd/arizona-spi.c
drivers/mfd/cros_ec_spi.c
drivers/mfd/da9052-spi.c
drivers/mfd/ezx-pcap.c
drivers/mfd/mc13xxx-spi.c
drivers/mfd/stmpe-spi.c
drivers/mfd/tps65912-spi.c
drivers/mfd/wm831x-spi.c
drivers/misc/ad525x_dpot-spi.c
drivers/misc/bmp085-spi.c
drivers/misc/eeprom/at25.c
drivers/misc/eeprom/eeprom_93xx46.c
drivers/misc/lattice-ecp3-config.c
drivers/misc/lis3lv02d/lis3lv02d_spi.c
drivers/misc/ti_dac7512.c
drivers/mmc/host/mmc_spi.c
drivers/mtd/devices/m25p80.c
drivers/mtd/devices/mtd_dataflash.c
drivers/mtd/devices/sst25l.c
drivers/net/can/spi/mcp251x.c
drivers/net/ethernet/micrel/ks8851.c
drivers/net/ethernet/microchip/enc28j60.c
drivers/net/ethernet/qualcomm/qca_spi.c
drivers/net/ieee802154/at86rf230.c
drivers/net/ieee802154/cc2520.c
drivers/net/ieee802154/mrf24j40.c
drivers/net/phy/spi_ks8995.c
drivers/net/wireless/cw1200/cw1200_spi.c
drivers/net/wireless/libertas/if_spi.c
drivers/net/wireless/p54/p54spi.c
drivers/net/wireless/ti/wl1251/spi.c
drivers/net/wireless/ti/wlcore/spi.c
drivers/nfc/st-nci/spi.c
drivers/nfc/trf7970a.c
drivers/regulator/tps6524x-regulator.c
drivers/rtc/rtc-ds1305.c
drivers/rtc/rtc-ds1343.c
drivers/rtc/rtc-ds1347.c
drivers/rtc/rtc-ds1390.c
drivers/rtc/rtc-ds3234.c
drivers/rtc/rtc-m41t93.c
drivers/rtc/rtc-m41t94.c
drivers/rtc/rtc-max6902.c
drivers/rtc/rtc-mcp795.c
drivers/rtc/rtc-pcf2123.c
drivers/rtc/rtc-r9701.c
drivers/rtc/rtc-rs5c348.c
drivers/rtc/rtc-rx4581.c
drivers/spi/spi-omap-100k.c
drivers/spi/spi-omap-uwire.c
drivers/spi/spi-pxa2xx-dma.c
drivers/spi/spi-pxa2xx.c
drivers/spi/spi-pxa2xx.h
drivers/spi/spi-tle62x0.c
drivers/spi/spi.c
drivers/spi/spidev.c
drivers/staging/fbtft/fbtft.h
drivers/staging/fbtft/flexfb.c
drivers/staging/iio/accel/adis16201_core.c
drivers/staging/iio/accel/adis16203_core.c
drivers/staging/iio/accel/adis16204_core.c
drivers/staging/iio/accel/adis16209_core.c
drivers/staging/iio/accel/adis16220_core.c
drivers/staging/iio/accel/adis16240_core.c
drivers/staging/iio/accel/lis3l02dq_core.c
drivers/staging/iio/accel/sca3000_core.c
drivers/staging/iio/adc/ad7192.c
drivers/staging/iio/adc/ad7280a.c
drivers/staging/iio/adc/ad7606_spi.c
drivers/staging/iio/adc/ad7780.c
drivers/staging/iio/adc/ad7816.c
drivers/staging/iio/addac/adt7316-spi.c
drivers/staging/iio/frequency/ad9832.c
drivers/staging/iio/frequency/ad9834.c
drivers/staging/iio/gyro/adis16060_core.c
drivers/staging/iio/magnetometer/hmc5843_spi.c
drivers/staging/iio/meter/ade7753.c
drivers/staging/iio/meter/ade7754.c
drivers/staging/iio/meter/ade7758_core.c
drivers/staging/iio/meter/ade7759.c
drivers/staging/iio/meter/ade7854-spi.c
drivers/staging/iio/resolver/ad2s1200.c
drivers/staging/iio/resolver/ad2s1210.c
drivers/staging/iio/resolver/ad2s90.c
drivers/staging/mt29f_spinand/mt29f_spinand.c
drivers/tty/serial/ifx6x60.c
drivers/tty/serial/max3100.c
drivers/tty/serial/max310x.c
drivers/tty/serial/sc16is7xx.c
drivers/usb/host/max3421-hcd.c
drivers/video/backlight/ams369fg06.c
drivers/video/backlight/corgi_lcd.c
drivers/video/backlight/ili922x.c
drivers/video/backlight/l4f00242t03.c
drivers/video/backlight/ld9040.c
drivers/video/backlight/lms283gf05.c
drivers/video/backlight/lms501kf03.c
drivers/video/backlight/ltv350qv.c
drivers/video/backlight/s6e63m0.c
drivers/video/backlight/tdo24m.c
drivers/video/backlight/tosa_lcd.c
drivers/video/backlight/vgg2432a4.c
drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
drivers/video/fbdev/omap/lcd_mipid.c
drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c
drivers/video/fbdev/omap2/displays-new/panel-nec-nl8048hl11.c
drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c
drivers/video/fbdev/omap2/displays-new/panel-tpo-td028ttec1.c
drivers/video/fbdev/omap2/displays-new/panel-tpo-td043mtea1.c
include/linux/pxa2xx_ssp.h
include/linux/spi/spi.h
sound/soc/codecs/ad1836.c
sound/soc/codecs/ad193x-spi.c
sound/soc/codecs/adau1761-spi.c
sound/soc/codecs/adau1781-spi.c
sound/soc/codecs/adau1977-spi.c
sound/soc/codecs/adav801.c
sound/soc/codecs/ak4104.c
sound/soc/codecs/cs4271-spi.c
sound/soc/codecs/da7210.c
sound/soc/codecs/pcm1792a.c
sound/soc/codecs/pcm512x-spi.c
sound/soc/codecs/rt5677-spi.c
sound/soc/codecs/ssm2602-spi.c
sound/soc/codecs/tlv320aic23-spi.c
sound/soc/codecs/tlv320aic26.c
sound/soc/codecs/wm0010.c
sound/soc/codecs/wm8510.c
sound/soc/codecs/wm8711.c
sound/soc/codecs/wm8728.c
sound/soc/codecs/wm8731.c
sound/soc/codecs/wm8737.c
sound/soc/codecs/wm8741.c
sound/soc/codecs/wm8750.c
sound/soc/codecs/wm8753.c
sound/soc/codecs/wm8770.c
sound/soc/codecs/wm8776.c
sound/soc/codecs/wm8804-spi.c
sound/soc/codecs/wm8900.c
sound/soc/codecs/wm8983.c
sound/soc/codecs/wm8985.c
sound/soc/codecs/wm8988.c
sound/soc/codecs/wm8995.c

index 1319968..68fe986 100644 (file)
@@ -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,
index 3dbad99..d833dd2 100644 (file)
@@ -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,
 };
index f0184a1..f974c94 100644 (file)
@@ -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),
index e3d968f..60172f8 100644 (file)
@@ -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,
index 6e1c984..05813fb 100644 (file)
@@ -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,
index a431604..2853731 100644 (file)
@@ -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,
index 73db7ec..4a41694 100644 (file)
@@ -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,
@@ -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),
        },
 };
index a7b4939..6989238 100644 (file)
@@ -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,
        },
 };
index b202377..3cf4cf6 100644 (file)
@@ -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,
        },
 };
index 1195546..202c1fb 100644 (file)
@@ -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,
index 04c08c2..69e0bb9 100644 (file)
@@ -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,
index 3eff73b..4fd9e4d 100644 (file)
@@ -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,
index 5994cf6..ec02f4f 100644 (file)
@@ -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,
index 9296e9d..583f883 100644 (file)
@@ -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,
index f67d71e..36544c4 100644 (file)
@@ -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,
index 98ba761..923f565 100644 (file)
@@ -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,
index 54b61a3..f71b0d3 100644 (file)
@@ -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,
index 70f78c3..21e19b6 100644 (file)
@@ -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,
index 4a8c0a2..62bb8f7 100644 (file)
@@ -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,
index ce400ec..be85c2a 100644 (file)
@@ -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,
index c19f8fd..cf172d5 100644 (file)
@@ -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,
index b84922a..eea0c79 100644 (file)
@@ -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,
index 2fd012e..2d3c397 100644 (file)
@@ -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,
index 28732c2..45e29cc 100644 (file)
@@ -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,
index 44bf815..3bc059c 100644 (file)
@@ -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,
index b19e4f9..d5d8b41 100644 (file)
@@ -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,
index 915be6b..76b6196 100644 (file)
@@ -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,
index c0d364e..6da31e4 100644 (file)
@@ -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,
index d338bb5..ea7adb6 100644 (file)
@@ -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"
        },
index c067e68..9e4d2c1 100644 (file)
@@ -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,
index 64634d7..8ba0e9c 100644 (file)
@@ -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,
index 130de9b..97d2c51 100644 (file)
@@ -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,
index 787ef1d..968712b 100644 (file)
@@ -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,
 };
index 07e17d7..b555552 100644 (file)
@@ -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,
index 64d7256..5f32023 100644 (file)
@@ -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,
index 581ec14..88b2c92 100644 (file)
@@ -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,
index e98428d..5489ec4 100644 (file)
@@ -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,
index 15c73e2..d1d8450 100644 (file)
@@ -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,
index a7c851f..bfb350a 100644 (file)
@@ -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,
index d0d3816..9a547bb 100644 (file)
@@ -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,
index 5ba785f..33e4ae5 100644 (file)
@@ -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,
index fa28100..399de2c 100644 (file)
@@ -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,
index 92cf4ca..3854d20 100644 (file)
@@ -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,
index 50ed8d1..44a30f2 100644 (file)
@@ -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,
index 9890c81..b83534c 100644 (file)
@@ -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,
index add5098..ad31a13 100644 (file)
@@ -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,
index 8d08c7e..e5241f4 100644 (file)
@@ -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,
 };
index 26de876..f8d1c22 100644 (file)
@@ -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,
index 00c6ad9..7da8825 100644 (file)
@@ -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,
index eb0e08e..a330d42 100644 (file)
@@ -456,7 +456,6 @@ MODULE_DEVICE_TABLE(spi, adxrs450_id);
 static struct spi_driver adxrs450_driver = {
        .driver = {
                .name = "adxrs450",
-               .owner = THIS_MODULE,
        },
        .probe = adxrs450_probe,
        .id_table       = adxrs450_id,
index e59bead..d2b7a5f 100644 (file)
@@ -60,7 +60,6 @@ MODULE_DEVICE_TABLE(spi, st_gyro_id_table);
 
 static struct spi_driver st_gyro_driver = {
        .driver = {
-               .owner = THIS_MODULE,
                .name = "st-gyro-spi",
        },
        .probe = st_gyro_spi_probe,
index abc4c50..0618f83 100644 (file)
@@ -986,7 +986,6 @@ MODULE_DEVICE_TABLE(spi, adis16400_id);
 static struct spi_driver adis16400_driver = {
        .driver = {
                .name = "adis16400",
-               .owner = THIS_MODULE,
        },
        .id_table = adis16400_id,
        .probe = adis16400_probe,
index b94bfd3..2485b88 100644 (file)
@@ -896,7 +896,6 @@ MODULE_DEVICE_TABLE(spi, adis16480_ids);
 static struct spi_driver adis16480_driver = {
        .driver = {
                .name = "adis16480",
-               .owner = THIS_MODULE,
        },
        .id_table = adis16480_ids,
        .probe = adis16480_probe,
index 0abca2c..6325e7d 100644 (file)
@@ -58,7 +58,6 @@ MODULE_DEVICE_TABLE(spi, st_magn_id_table);
 
 static struct spi_driver st_magn_driver = {
        .driver = {
-               .owner = THIS_MODULE,
                .name = "st-magn-spi",
        },
        .probe = st_magn_spi_probe,
index 08ee6e8..aaa0c4b 100644 (file)
@@ -117,7 +117,6 @@ MODULE_DEVICE_TABLE(spi, ms5611_id);
 static struct spi_driver ms5611_driver = {
        .driver = {
                .name = "ms5611",
-               .owner = THIS_MODULE,
        },
        .id_table = ms5611_id,
        .probe = ms5611_spi_probe,
index 1ffa6d4..40c0692 100644 (file)
@@ -56,7 +56,6 @@ MODULE_DEVICE_TABLE(spi, st_press_id_table);
 
 static struct spi_driver st_press_driver = {
        .driver = {
-               .owner = THIS_MODULE,
                .name = "st-press-spi",
        },
        .probe = st_press_spi_probe,
index bc0d68e..2865aa6 100644 (file)
@@ -443,7 +443,6 @@ MODULE_DEVICE_TABLE(spi, as3935_id);
 static struct spi_driver as3935_driver = {
        .driver = {
                .name   = "as3935",
-               .owner  = THIS_MODULE,
                .pm     = AS3935_PM_OPS,
        },
        .probe          = as3935_probe,
index a79e50b..fea315e 100644 (file)
@@ -113,7 +113,6 @@ static int ad714x_spi_remove(struct spi_device *spi)
 static struct spi_driver ad714x_spi_driver = {
        .driver = {
                .name   = "ad714x_captouch",
-               .owner  = THIS_MODULE,
                .pm     = &ad714x_spi_pm,
        },
        .probe          = ad714x_spi_probe,
index da6e76b..3ec03ad 100644 (file)
@@ -120,7 +120,6 @@ static SIMPLE_DEV_PM_OPS(adxl34x_spi_pm, adxl34x_spi_suspend,
 static struct spi_driver adxl34x_driver = {
        .driver = {
                .name = "adxl34x",
-               .owner = THIS_MODULE,
                .pm = &adxl34x_spi_pm,
        },
        .probe   = adxl34x_spi_probe,
index da4e5bb..9c250ae 100644 (file)
@@ -843,7 +843,6 @@ static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
 static struct spi_driver ad7877_driver = {
        .driver = {
                .name   = "ad7877",
-               .owner  = THIS_MODULE,
                .pm     = &ad7877_pm,
        },
        .probe          = ad7877_probe,
index 1a7b114..48033c2 100644 (file)
@@ -149,7 +149,6 @@ static int ad7879_spi_remove(struct spi_device *spi)
 static struct spi_driver ad7879_spi_driver = {
        .driver = {
                .name   = "ad7879",
-               .owner  = THIS_MODULE,
                .pm     = &ad7879_pm_ops,
        },
        .probe          = ad7879_spi_probe,
index 04edc8f..e431cf6 100644 (file)
@@ -1500,7 +1500,6 @@ static int ads7846_remove(struct spi_device *spi)
 static struct spi_driver ads7846_driver = {
        .driver = {
                .name   = "ads7846",
-               .owner  = THIS_MODULE,
                .pm     = &ads7846_pm,
                .of_match_table = of_match_ptr(ads7846_dt_ids),
        },
index b19434c..ec5f7c7 100644 (file)
@@ -185,7 +185,6 @@ static int cyttsp4_spi_remove(struct spi_device *spi)
 static struct spi_driver cyttsp4_spi_driver = {
        .driver = {
                .name   = CYTTSP4_SPI_NAME,
-               .owner  = THIS_MODULE,
                .pm     = &cyttsp4_pm_ops,
        },
        .probe  = cyttsp4_spi_probe,
index 4728bcb..bbeeb24 100644 (file)
@@ -182,7 +182,6 @@ static int cyttsp_spi_remove(struct spi_device *spi)
 static struct spi_driver cyttsp_spi_driver = {
        .driver = {
                .name   = CY_SPI_NAME,
-               .owner  = THIS_MODULE,
                .pm     = &cyttsp_pm_ops,
        },
        .probe  = cyttsp_spi_probe,
index 0f65d02..f41f233 100644 (file)
@@ -752,7 +752,6 @@ static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume);
 static struct spi_driver tsc2005_driver = {
        .driver = {
                .name   = "tsc2005",
-               .owner  = THIS_MODULE,
                .pm     = &tsc2005_pm_ops,
        },
        .probe  = tsc2005_probe,
index db3ba8b..3141596 100644 (file)
@@ -122,7 +122,6 @@ static struct spi_driver dac124s085_driver = {
        .remove         = dac124s085_remove,
        .driver = {
                .name   = "dac124s085",
-               .owner  = THIS_MODULE,
        },
 };
 
index fa4a5eb..d744b17 100644 (file)
@@ -149,7 +149,6 @@ int s5c73m3_register_spi_driver(struct s5c73m3 *state)
        spidrv->remove = s5c73m3_spi_remove;
        spidrv->probe = s5c73m3_spi_probe;
        spidrv->driver.name = S5C73M3_SPI_DRV_NAME;
-       spidrv->driver.owner = THIS_MODULE;
        spidrv->driver.of_match_table = s5c73m3_spi_ids;
 
        return spi_register_driver(spidrv);
index b533240..3a12ef3 100644 (file)
@@ -513,7 +513,6 @@ MODULE_DEVICE_TABLE(spi, msi001_id_table);
 static struct spi_driver msi001_driver = {
        .driver = {
                .name   = "msi001",
-               .owner  = THIS_MODULE,
                .suppress_bind_attrs = true,
        },
        .probe          = msi001_probe,
index 1e845f6..03d62f7 100644 (file)
@@ -93,7 +93,6 @@ MODULE_DEVICE_TABLE(spi, arizona_spi_ids);
 static struct spi_driver arizona_spi_driver = {
        .driver = {
                .name   = "arizona",
-               .owner  = THIS_MODULE,
                .pm     = &arizona_pm_ops,
                .of_match_table = of_match_ptr(arizona_of_match),
        },
index 30a296b..6a0f6ec 100644 (file)
@@ -717,7 +717,6 @@ static struct spi_driver cros_ec_driver_spi = {
        .driver = {
                .name   = "cros-ec-spi",
                .of_match_table = of_match_ptr(cros_ec_spi_of_match),
-               .owner  = THIS_MODULE,
                .pm     = &cros_ec_spi_pm_ops,
        },
        .probe          = cros_ec_spi_probe,
index b5de8a6..71b89dd 100644 (file)
@@ -86,7 +86,6 @@ static struct spi_driver da9052_spi_driver = {
        .id_table = da9052_spi_id,
        .driver = {
                .name = "da9052",
-               .owner = THIS_MODULE,
        },
 };
 
index b279205..542b47c 100644 (file)
@@ -513,7 +513,6 @@ static struct spi_driver ezxpcap_driver = {
        .remove = ezx_pcap_remove,
        .driver = {
                .name   = "ezx-pcap",
-               .owner  = THIS_MODULE,
        },
 };
 
index 58a170e..cbc1e5e 100644 (file)
@@ -177,7 +177,6 @@ static struct spi_driver mc13xxx_spi_driver = {
        .id_table = mc13xxx_device_id,
        .driver = {
                .name = "mc13xxx",
-               .owner = THIS_MODULE,
                .of_match_table = mc13xxx_dt_ids,
        },
        .probe = mc13xxx_spi_probe,
index 618ba24..f8b14ab 100644 (file)
@@ -135,7 +135,6 @@ static struct spi_driver stmpe_spi_driver = {
        .driver = {
                .name   = "stmpe-spi",
                .of_match_table = of_match_ptr(stmpe_spi_of_match),
-               .owner  = THIS_MODULE,
 #ifdef CONFIG_PM
                .pm     = &stmpe_dev_pm_ops,
 #endif
index de60ad9..d59aa55 100644 (file)
@@ -111,7 +111,6 @@ static int tps65912_spi_remove(struct spi_device *spi)
 static struct spi_driver tps65912_spi_driver = {
        .driver = {
                .name = "tps65912",
-               .owner = THIS_MODULE,
        },
        .probe  = tps65912_spi_probe,
        .remove = tps65912_spi_remove,
index b8a5e3b..80482ae 100644 (file)
@@ -96,7 +96,6 @@ MODULE_DEVICE_TABLE(spi, wm831x_spi_ids);
 static struct spi_driver wm831x_spi_driver = {
        .driver = {
                .name   = "wm831x",
-               .owner  = THIS_MODULE,
                .pm     = &wm831x_spi_pm,
        },
        .id_table       = wm831x_spi_ids,
index f4c82ea..39a7f51 100644 (file)
@@ -132,7 +132,6 @@ MODULE_DEVICE_TABLE(spi, ad_dpot_spi_id);
 static struct spi_driver ad_dpot_spi_driver = {
        .driver = {
                .name   = "ad_dpot",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad_dpot_spi_probe,
        .remove         = ad_dpot_spi_remove,
index 864ecac..17ecbf9 100644 (file)
@@ -64,7 +64,6 @@ MODULE_DEVICE_TABLE(spi, bmp085_id);
 
 static struct spi_driver bmp085_spi_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = BMP085_NAME,
                .of_match_table = bmp085_of_match
        },
index 0a1af93..f850ef5 100644 (file)
@@ -462,7 +462,6 @@ MODULE_DEVICE_TABLE(of, at25_of_match);
 static struct spi_driver at25_driver = {
        .driver = {
                .name           = "at25",
-               .owner          = THIS_MODULE,
                .of_match_table = at25_of_match,
        },
        .probe          = at25_probe,
index a6bd9e3..ff63f05 100644 (file)
@@ -370,7 +370,6 @@ static int eeprom_93xx46_remove(struct spi_device *spi)
 static struct spi_driver eeprom_93xx46_driver = {
        .driver = {
                .name   = "93xx46",
-               .owner  = THIS_MODULE,
        },
        .probe          = eeprom_93xx46_probe,
        .remove         = eeprom_93xx46_remove,
index c544f1f..626fdca 100644 (file)
@@ -235,7 +235,6 @@ MODULE_DEVICE_TABLE(spi, lattice_ecp3_id);
 static struct spi_driver lattice_ecp3_driver = {
        .driver = {
                .name = "lattice-ecp3",
-               .owner = THIS_MODULE,
        },
        .probe = lattice_ecp3_probe,
        .remove = lattice_ecp3_remove,
index b2f6e16..e575475 100644 (file)
@@ -138,7 +138,6 @@ static SIMPLE_DEV_PM_OPS(lis3lv02d_spi_pm, lis3lv02d_spi_suspend,
 static struct spi_driver lis302dl_spi_driver = {
        .driver  = {
                .name   = DRV_NAME,
-               .owner  = THIS_MODULE,
                .pm     = &lis3lv02d_spi_pm,
                .of_match_table = of_match_ptr(lis302dl_spi_dt_ids),
        },
index cb0289b..f5456fb 100644 (file)
@@ -89,7 +89,6 @@ MODULE_DEVICE_TABLE(of, dac7512_of_match);
 static struct spi_driver dac7512_driver = {
        .driver = {
                .name   = "dac7512",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(dac7512_of_match),
        },
        .probe  = dac7512_probe,
index ae19d83..8c79831 100644 (file)
@@ -1515,7 +1515,6 @@ static const struct of_device_id mmc_spi_of_match_table[] = {
 static struct spi_driver mmc_spi_driver = {
        .driver = {
                .name =         "mmc_spi",
-               .owner =        THIS_MODULE,
                .of_match_table = mmc_spi_of_match_table,
        },
        .probe =        mmc_spi_probe,
index 9cd3631..fcf171a 100644 (file)
@@ -304,7 +304,6 @@ MODULE_DEVICE_TABLE(of, m25p_of_table);
 static struct spi_driver m25p80_driver = {
        .driver = {
                .name   = "m25p80",
-               .owner  = THIS_MODULE,
                .of_match_table = m25p_of_table,
        },
        .id_table       = m25p_ids,
index df6f611..70c1639 100644 (file)
@@ -911,7 +911,6 @@ static int dataflash_remove(struct spi_device *spi)
 static struct spi_driver dataflash_driver = {
        .driver = {
                .name           = "mtd_dataflash",
-               .owner          = THIS_MODULE,
                .of_match_table = of_match_ptr(dataflash_dt_ids),
        },
 
index c63ecbc..18febf7 100644 (file)
@@ -417,7 +417,6 @@ static int sst25l_remove(struct spi_device *spi)
 static struct spi_driver sst25l_driver = {
        .driver = {
                .name   = "sst25l",
-               .owner  = THIS_MODULE,
        },
        .probe          = sst25l_probe,
        .remove         = sst25l_remove,
index b7e83c2..575790e 100644 (file)
@@ -1243,7 +1243,6 @@ static SIMPLE_DEV_PM_OPS(mcp251x_can_pm_ops, mcp251x_can_suspend,
 static struct spi_driver mcp251x_can_driver = {
        .driver = {
                .name = DEVICE_NAME,
-               .owner = THIS_MODULE,
                .of_match_table = mcp251x_of_match,
                .pm = &mcp251x_can_pm_ops,
        },
index 60f43ec..1edc973 100644 (file)
@@ -1607,7 +1607,6 @@ static struct spi_driver ks8851_driver = {
        .driver = {
                .name = "ks8851",
                .of_match_table = ks8851_match_table,
-               .owner = THIS_MODULE,
                .pm = &ks8851_pm_ops,
        },
        .probe = ks8851_probe,
index b1b5f66..86ea17e 100644 (file)
@@ -1633,7 +1633,6 @@ static int enc28j60_remove(struct spi_device *spi)
 static struct spi_driver enc28j60_driver = {
        .driver = {
                   .name = DRV_NAME,
-                  .owner = THIS_MODULE,
         },
        .probe = enc28j60_probe,
        .remove = enc28j60_remove,
index 2f87909..ddb2c6c 100644 (file)
@@ -974,7 +974,6 @@ MODULE_DEVICE_TABLE(spi, qca_spi_id);
 static struct spi_driver qca_spi_driver = {
        .driver = {
                .name   = QCASPI_DRV_NAME,
-               .owner  = THIS_MODULE,
                .of_match_table = qca_spi_of_match,
        },
        .id_table = qca_spi_id,
index 6422caa..46805ab 100644 (file)
@@ -1763,7 +1763,6 @@ static struct spi_driver at86rf230_driver = {
        .driver = {
                .of_match_table = of_match_ptr(at86rf230_of_match),
                .name   = "at86rf230",
-               .owner  = THIS_MODULE,
        },
        .probe      = at86rf230_probe,
        .remove     = at86rf230_remove,
index c5b54a1..e65b605 100644 (file)
@@ -1152,7 +1152,6 @@ MODULE_DEVICE_TABLE(of, cc2520_of_ids);
 static struct spi_driver cc2520_driver = {
        .driver = {
                .name = "cc2520",
-               .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(cc2520_of_ids),
        },
        .id_table = cc2520_ids,
index 997724b..e4c37d4 100644 (file)
@@ -812,7 +812,6 @@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
 static struct spi_driver mrf24j40_driver = {
        .driver = {
                .name = "mrf24j40",
-               .owner = THIS_MODULE,
        },
        .id_table = mrf24j40_ids,
        .probe = mrf24j40_probe,
index f091d69..c72c422 100644 (file)
@@ -343,7 +343,6 @@ static int ks8995_remove(struct spi_device *spi)
 static struct spi_driver ks8995_driver = {
        .driver = {
                .name       = "spi-ks8995",
-               .owner     = THIS_MODULE,
        },
        .probe    = ks8995_probe,
        .remove   = ks8995_remove,
index 29185ae..a740083 100644 (file)
@@ -467,7 +467,6 @@ static struct spi_driver spi_driver = {
        .remove         = cw1200_spi_disconnect,
        .driver = {
                .name           = "cw1200_wlan_spi",
-               .owner          = THIS_MODULE,
 #ifdef CONFIG_PM
                .pm             = &cw1200_pm_ops,
 #endif
index f11728a..82c0796 100644 (file)
@@ -1283,7 +1283,6 @@ static struct spi_driver libertas_spi_driver = {
        .remove = libertas_spi_remove,
        .driver = {
                .name   = "libertas_spi",
-               .owner  = THIS_MODULE,
                .pm     = &if_spi_pm_ops,
        },
 };
index 63de5ee..7ab2f43 100644 (file)
@@ -705,7 +705,6 @@ static int p54spi_remove(struct spi_device *spi)
 static struct spi_driver p54spi_driver = {
        .driver = {
                .name           = "p54spi",
-               .owner          = THIS_MODULE,
        },
 
        .probe          = p54spi_probe,
index 735be53..8de9d44 100644 (file)
@@ -354,7 +354,6 @@ static int wl1251_spi_remove(struct spi_device *spi)
 static struct spi_driver wl1251_spi_driver = {
        .driver = {
                .name           = DRIVER_NAME,
-               .owner          = THIS_MODULE,
        },
 
        .probe          = wl1251_spi_probe,
index f1ac283..236b410 100644 (file)
@@ -408,7 +408,6 @@ static int wl1271_remove(struct spi_device *spi)
 static struct spi_driver wl1271_spi_driver = {
        .driver = {
                .name           = "wl1271_spi",
-               .owner          = THIS_MODULE,
        },
 
        .probe          = wl1271_probe,
index 598a58c..2bb5851 100644 (file)
@@ -377,7 +377,6 @@ MODULE_DEVICE_TABLE(of, of_st_nci_spi_match);
 
 static struct spi_driver st_nci_spi_driver = {
        .driver = {
-               .owner = THIS_MODULE,
                .name = ST_NCI_SPI_DRIVER_NAME,
                .of_match_table = of_match_ptr(of_st_nci_spi_match),
        },
index 70b0707..4036788 100644 (file)
@@ -2223,7 +2223,6 @@ static struct spi_driver trf7970a_spi_driver = {
        .id_table       = trf7970a_id_table,
        .driver         = {
                .name   = "trf7970a",
-               .owner  = THIS_MODULE,
                .pm     = &trf7970a_pm_ops,
        },
 };
index 5b494db..9d6ea3a 100644 (file)
@@ -629,7 +629,6 @@ static struct spi_driver pmic_driver = {
        .probe          = pmic_probe,
        .driver         = {
                .name   = "tps6524x",
-               .owner  = THIS_MODULE,
        },
 };
 
index baa5d04..85706a9 100644 (file)
@@ -772,7 +772,6 @@ static int ds1305_remove(struct spi_device *spi)
 
 static struct spi_driver ds1305_driver = {
        .driver.name    = "rtc-ds1305",
-       .driver.owner   = THIS_MODULE,
        .probe          = ds1305_probe,
        .remove         = ds1305_remove,
        /* REVISIT add suspend/resume */
index 79a06dd..07371a9 100644 (file)
@@ -731,7 +731,6 @@ static SIMPLE_DEV_PM_OPS(ds1343_pm, ds1343_suspend, ds1343_resume);
 static struct spi_driver ds1343_driver = {
        .driver = {
                .name = "ds1343",
-               .owner = THIS_MODULE,
                .pm = &ds1343_pm,
        },
        .probe = ds1343_probe,
index c82b4c0..641e8e8 100644 (file)
@@ -154,7 +154,6 @@ static int ds1347_probe(struct spi_device *spi)
 static struct spi_driver ds1347_driver = {
        .driver = {
                .name = "ds1347",
-               .owner = THIS_MODULE,
        },
        .probe = ds1347_probe,
 };
index e67bfcb..4c229c9 100644 (file)
@@ -156,7 +156,6 @@ static int ds1390_probe(struct spi_device *spi)
 static struct spi_driver ds1390_driver = {
        .driver = {
                .name   = "rtc-ds1390",
-               .owner  = THIS_MODULE,
        },
        .probe  = ds1390_probe,
 };
index 4c9ba53..570ab28 100644 (file)
@@ -159,7 +159,6 @@ static int ds3234_probe(struct spi_device *spi)
 static struct spi_driver ds3234_driver = {
        .driver = {
                .name    = "ds3234",
-               .owner  = THIS_MODULE,
        },
        .probe   = ds3234_probe,
 };
index 4698c7e..5ac45fc 100644 (file)
@@ -197,7 +197,6 @@ static int m41t93_probe(struct spi_device *spi)
 static struct spi_driver m41t93_driver = {
        .driver = {
                .name   = "rtc-m41t93",
-               .owner  = THIS_MODULE,
        },
        .probe  = m41t93_probe,
 };
index 8d800b1..1f0eb79 100644 (file)
@@ -137,7 +137,6 @@ static int m41t94_probe(struct spi_device *spi)
 static struct spi_driver m41t94_driver = {
        .driver = {
                .name   = "rtc-m41t94",
-               .owner  = THIS_MODULE,
        },
        .probe  = m41t94_probe,
 };
index ac3f419..315d09e 100644 (file)
@@ -146,7 +146,6 @@ static int max6902_probe(struct spi_device *spi)
 static struct spi_driver max6902_driver = {
        .driver = {
                .name   = "rtc-max6902",
-               .owner  = THIS_MODULE,
        },
        .probe  = max6902_probe,
 };
index 34295bf..1c91ce8 100644 (file)
@@ -186,7 +186,6 @@ static int mcp795_probe(struct spi_device *spi)
 static struct spi_driver mcp795_driver = {
                .driver = {
                                .name = "rtc-mcp795",
-                               .owner = THIS_MODULE,
                },
                .probe = mcp795_probe,
 };
index 1c47650..ea8a31c 100644 (file)
@@ -346,7 +346,6 @@ MODULE_DEVICE_TABLE(of, pcf2123_dt_ids);
 static struct spi_driver pcf2123_driver = {
        .driver = {
                        .name   = "rtc-pcf2123",
-                       .owner  = THIS_MODULE,
                        .of_match_table = of_match_ptr(pcf2123_dt_ids),
        },
        .probe  = pcf2123_probe,
index feeedbd..83d2bcc 100644 (file)
@@ -172,7 +172,6 @@ static int r9701_remove(struct spi_device *spi)
 static struct spi_driver r9701_driver = {
        .driver = {
                .name   = "rtc-r9701",
-               .owner  = THIS_MODULE,
        },
        .probe  = r9701_probe,
        .remove = r9701_remove,
index 090a101..1162fec 100644 (file)
@@ -221,7 +221,6 @@ static int rs5c348_probe(struct spi_device *spi)
 static struct spi_driver rs5c348_driver = {
        .driver = {
                .name   = "rtc-rs5c348",
-               .owner  = THIS_MODULE,
        },
        .probe  = rs5c348_probe,
 };
index 6889222..de3fe4f 100644 (file)
@@ -291,7 +291,6 @@ MODULE_DEVICE_TABLE(spi, rx4581_id);
 static struct spi_driver rx4581_driver = {
        .driver = {
                .name   = "rtc-rx4581",
-               .owner  = THIS_MODULE,
        },
        .probe  = rx4581_probe,
        .id_table = rx4581_id,
index 35b332d..76a8425 100644 (file)
@@ -244,12 +244,12 @@ static int omap1_spi100k_setup_transfer(struct spi_device *spi,
 {
        struct omap1_spi100k *spi100k = spi_master_get_devdata(spi->master);
        struct omap1_spi100k_cs *cs = spi->controller_state;
-       u8 word_len = spi->bits_per_word;
+       u8 word_len;
 
-       if (t != NULL && t->bits_per_word)
+       if (t != NULL)
                word_len = t->bits_per_word;
-       if (!word_len)
-               word_len = 8;
+       else
+               word_len = spi->bits_per_word;
 
        if (spi->bits_per_word > 32)
                return -EINVAL;
@@ -302,7 +302,6 @@ static int omap1_spi100k_transfer_one_message(struct spi_master *master,
        struct spi_device *spi = m->spi;
        struct spi_transfer *t = NULL;
        int cs_active = 0;
-       int par_override = 0;
        int status = 0;
 
        list_for_each_entry(t, &m->transfers, transfer_list) {
@@ -310,14 +309,9 @@ static int omap1_spi100k_transfer_one_message(struct spi_master *master,
                        status = -EINVAL;
                        break;
                }
-               if (par_override || t->speed_hz || t->bits_per_word) {
-                       par_override = 1;
-                       status = omap1_spi100k_setup_transfer(spi, t);
-                       if (status < 0)
-                               break;
-                       if (!t->speed_hz && !t->bits_per_word)
-                               par_override = 0;
-               }
+               status = omap1_spi100k_setup_transfer(spi, t);
+               if (status < 0)
+                       break;
 
                if (!cs_active) {
                        omap1_spi100k_force_cs(spi100k, 1);
@@ -347,11 +341,7 @@ static int omap1_spi100k_transfer_one_message(struct spi_master *master,
                }
        }
 
-       /* Restore defaults if they were overriden */
-       if (par_override) {
-               par_override = 0;
-               status = omap1_spi100k_setup_transfer(spi, NULL);
-       }
+       status = omap1_spi100k_setup_transfer(spi, NULL);
 
        if (cs_active)
                omap1_spi100k_force_cs(spi100k, 0);
index 55576db..ce8dbdb 100644 (file)
@@ -205,7 +205,7 @@ static void uwire_chipselect(struct spi_device *spi, int value)
 static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
 {
        unsigned        len = t->len;
-       unsigned        bits = t->bits_per_word ? : spi->bits_per_word;
+       unsigned        bits = t->bits_per_word;
        unsigned        bytes;
        u16             val, w;
        int             status = 0;
@@ -344,9 +344,10 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
        /* assume it's already enabled */
        rate = clk_get_rate(uwire->ck);
 
-       hz = spi->max_speed_hz;
-       if (t != NULL && t->speed_hz)
+       if (t != NULL)
                hz = t->speed_hz;
+       else
+               hz = spi->max_speed_hz;
 
        if (!hz) {
                pr_debug("%s: zero speed?\n", dev_name(&spi->dev));
index 66a1739..bd8b369 100644 (file)
@@ -344,10 +344,6 @@ void pxa2xx_spi_dma_release(struct driver_data *drv_data)
        }
 }
 
-void pxa2xx_spi_dma_resume(struct driver_data *drv_data)
-{
-}
-
 int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,
                                           struct spi_device *spi,
                                           u8 bits_per_word, u32 *burst_code,
index a8ef38e..b25dc71 100644 (file)
@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/bitops.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -61,9 +62,13 @@ MODULE_ALIAS("platform:pxa2xx-spi");
                                | QUARK_X1000_SSCR1_TFT         \
                                | SSCR1_SPH | SSCR1_SPO | SSCR1_LBM)
 
-#define GENERAL_REG_RXTO_HOLDOFF_DISABLE BIT(24)
-#define SPI_CS_CONTROL_SW_MODE BIT(0)
-#define SPI_CS_CONTROL_CS_HIGH BIT(1)
+#define LPSS_GENERAL_REG_RXTO_HOLDOFF_DISABLE  BIT(24)
+#define LPSS_CS_CONTROL_SW_MODE                        BIT(0)
+#define LPSS_CS_CONTROL_CS_HIGH                        BIT(1)
+#define LPSS_CS_CONTROL_CS_SEL_SHIFT           8
+#define LPSS_CS_CONTROL_CS_SEL_MASK            (3 << LPSS_CS_CONTROL_CS_SEL_SHIFT)
+#define LPSS_CAPS_CS_EN_SHIFT                  9
+#define LPSS_CAPS_CS_EN_MASK                   (0xf << LPSS_CAPS_CS_EN_SHIFT)
 
 struct lpss_config {
        /* LPSS offset from drv_data->ioaddr */
@@ -72,6 +77,7 @@ struct lpss_config {
        int reg_general;
        int reg_ssp;
        int reg_cs_ctrl;
+       int reg_capabilities;
        /* FIFO thresholds */
        u32 rx_threshold;
        u32 tx_threshold_lo;
@@ -85,6 +91,7 @@ static const struct lpss_config lpss_platforms[] = {
                .reg_general = 0x08,
                .reg_ssp = 0x0c,
                .reg_cs_ctrl = 0x18,
+               .reg_capabilities = -1,
                .rx_threshold = 64,
                .tx_threshold_lo = 160,
                .tx_threshold_hi = 224,
@@ -94,6 +101,7 @@ static const struct lpss_config lpss_platforms[] = {
                .reg_general = 0x08,
                .reg_ssp = 0x0c,
                .reg_cs_ctrl = 0x18,
+               .reg_capabilities = -1,
                .rx_threshold = 64,
                .tx_threshold_lo = 160,
                .tx_threshold_hi = 224,
@@ -103,10 +111,21 @@ static const struct lpss_config lpss_platforms[] = {
                .reg_general = -1,
                .reg_ssp = 0x20,
                .reg_cs_ctrl = 0x24,
+               .reg_capabilities = 0xfc,
                .rx_threshold = 1,
                .tx_threshold_lo = 32,
                .tx_threshold_hi = 56,
        },
+       {       /* LPSS_BXT_SSP */
+               .offset = 0x200,
+               .reg_general = -1,
+               .reg_ssp = 0x20,
+               .reg_cs_ctrl = 0x24,
+               .reg_capabilities = 0xfc,
+               .rx_threshold = 1,
+               .tx_threshold_lo = 16,
+               .tx_threshold_hi = 48,
+       },
 };
 
 static inline const struct lpss_config
@@ -121,6 +140,7 @@ static bool is_lpss_ssp(const struct driver_data *drv_data)
        case LPSS_LPT_SSP:
        case LPSS_BYT_SSP:
        case LPSS_SPT_SSP:
+       case LPSS_BXT_SSP:
                return true;
        default:
                return false;
@@ -249,7 +269,9 @@ static void lpss_ssp_setup(struct driver_data *drv_data)
        drv_data->lpss_base = drv_data->ioaddr + config->offset;
 
        /* Enable software chip select control */
-       value = SPI_CS_CONTROL_SW_MODE | SPI_CS_CONTROL_CS_HIGH;
+       value = __lpss_ssp_read_priv(drv_data, config->reg_cs_ctrl);
+       value &= ~(LPSS_CS_CONTROL_SW_MODE | LPSS_CS_CONTROL_CS_HIGH);
+       value |= LPSS_CS_CONTROL_SW_MODE | LPSS_CS_CONTROL_CS_HIGH;
        __lpss_ssp_write_priv(drv_data, config->reg_cs_ctrl, value);
 
        /* Enable multiblock DMA transfers */
@@ -259,7 +281,7 @@ static void lpss_ssp_setup(struct driver_data *drv_data)
                if (config->reg_general >= 0) {
                        value = __lpss_ssp_read_priv(drv_data,
                                                     config->reg_general);
-                       value |= GENERAL_REG_RXTO_HOLDOFF_DISABLE;
+                       value |= LPSS_GENERAL_REG_RXTO_HOLDOFF_DISABLE;
                        __lpss_ssp_write_priv(drv_data,
                                              config->reg_general, value);
                }
@@ -269,15 +291,34 @@ static void lpss_ssp_setup(struct driver_data *drv_data)
 static void lpss_ssp_cs_control(struct driver_data *drv_data, bool enable)
 {
        const struct lpss_config *config;
-       u32 value;
+       u32 value, cs;
 
        config = lpss_get_config(drv_data);
 
        value = __lpss_ssp_read_priv(drv_data, config->reg_cs_ctrl);
-       if (enable)
-               value &= ~SPI_CS_CONTROL_CS_HIGH;
-       else
-               value |= SPI_CS_CONTROL_CS_HIGH;
+       if (enable) {
+               cs = drv_data->cur_msg->spi->chip_select;
+               cs <<= LPSS_CS_CONTROL_CS_SEL_SHIFT;
+               if (cs != (value & LPSS_CS_CONTROL_CS_SEL_MASK)) {
+                       /*
+                        * When switching another chip select output active
+                        * the output must be selected first and wait 2 ssp_clk
+                        * cycles before changing state to active. Otherwise
+                        * a short glitch will occur on the previous chip
+                        * select since output select is latched but state
+                        * control is not.
+                        */
+                       value &= ~LPSS_CS_CONTROL_CS_SEL_MASK;
+                       value |= cs;
+                       __lpss_ssp_write_priv(drv_data,
+                                             config->reg_cs_ctrl, value);
+                       ndelay(1000000000 /
+                              (drv_data->master->max_speed_hz / 2));
+               }
+               value &= ~LPSS_CS_CONTROL_CS_HIGH;
+       } else {
+               value |= LPSS_CS_CONTROL_CS_HIGH;
+       }
        __lpss_ssp_write_priv(drv_data, config->reg_cs_ctrl, value);
 }
 
@@ -734,7 +775,7 @@ static unsigned int quark_x1000_get_clk_div(int rate, u32 *dds)
        mul = (1 << 24) >> 1;
 
        /* Calculate initial quot */
-       q1 = DIV_ROUND_CLOSEST(fref1, rate);
+       q1 = DIV_ROUND_UP(fref1, rate);
 
        /* Scale q1 if it's too big */
        if (q1 > 256) {
@@ -759,7 +800,7 @@ static unsigned int quark_x1000_get_clk_div(int rate, u32 *dds)
 
        /* Case 2 */
 
-       q2 = DIV_ROUND_CLOSEST(fref2, rate);
+       q2 = DIV_ROUND_UP(fref2, rate);
        r2 = abs(fref2 / q2 - rate);
 
        /*
@@ -778,13 +819,13 @@ static unsigned int quark_x1000_get_clk_div(int rate, u32 *dds)
                mul = (1 << 24) * 2 / 5;
        }
 
-       /* Check case 3 only If the divisor is big enough */
+       /* Check case 3 only if the divisor is big enough */
        if (fref / rate >= 80) {
                u64 fssp;
                u32 m;
 
                /* Calculate initial quot */
-               q1 = DIV_ROUND_CLOSEST(fref, rate);
+               q1 = DIV_ROUND_UP(fref, rate);
                m = (1 << 24) / q1;
 
                /* Get the remainder */
@@ -806,7 +847,7 @@ static unsigned int quark_x1000_get_clk_div(int rate, u32 *dds)
 
 static unsigned int ssp_get_clk_div(struct driver_data *drv_data, int rate)
 {
-       unsigned long ssp_clk = drv_data->max_clk_rate;
+       unsigned long ssp_clk = drv_data->master->max_speed_hz;
        const struct ssp_device *ssp = drv_data->ssp;
 
        rate = min_t(int, ssp_clk, rate);
@@ -818,8 +859,9 @@ static unsigned int ssp_get_clk_div(struct driver_data *drv_data, int rate)
 }
 
 static unsigned int pxa2xx_ssp_get_clk_div(struct driver_data *drv_data,
-                                          struct chip_data *chip, int rate)
+                                          int rate)
 {
+       struct chip_data *chip = drv_data->cur_chip;
        unsigned int clk_div;
 
        switch (drv_data->ssp_type) {
@@ -922,52 +964,55 @@ static void pump_transfers(unsigned long data)
        drv_data->read = drv_data->rx ? chip->read : null_reader;
 
        /* Change speed and bit per word on a per transfer */
-       cr0 = chip->cr0;
-       if (transfer->speed_hz || transfer->bits_per_word) {
-
-               bits = chip->bits_per_word;
-               speed = chip->speed_hz;
-
-               if (transfer->speed_hz)
-                       speed = transfer->speed_hz;
-
-               if (transfer->bits_per_word)
-                       bits = transfer->bits_per_word;
-
-               clk_div = pxa2xx_ssp_get_clk_div(drv_data, chip, speed);
-
-               if (bits <= 8) {
-                       drv_data->n_bytes = 1;
-                       drv_data->read = drv_data->read != null_reader ?
-                                               u8_reader : null_reader;
-                       drv_data->write = drv_data->write != null_writer ?
-                                               u8_writer : null_writer;
-               } else if (bits <= 16) {
-                       drv_data->n_bytes = 2;
-                       drv_data->read = drv_data->read != null_reader ?
-                                               u16_reader : null_reader;
-                       drv_data->write = drv_data->write != null_writer ?
-                                               u16_writer : null_writer;
-               } else if (bits <= 32) {
-                       drv_data->n_bytes = 4;
-                       drv_data->read = drv_data->read != null_reader ?
-                                               u32_reader : null_reader;
-                       drv_data->write = drv_data->write != null_writer ?
-                                               u32_writer : null_writer;
-               }
-               /* if bits/word is changed in dma mode, then must check the
-                * thresholds and burst also */
-               if (chip->enable_dma) {
-                       if (pxa2xx_spi_set_dma_burst_and_threshold(chip,
-                                                       message->spi,
-                                                       bits, &dma_burst,
-                                                       &dma_thresh))
-                               dev_warn_ratelimited(&message->spi->dev,
-                                                    "pump_transfers: DMA burst size reduced to match bits_per_word\n");
-               }
-
-               cr0 = pxa2xx_configure_sscr0(drv_data, clk_div, bits);
+       bits = transfer->bits_per_word;
+       speed = transfer->speed_hz;
+
+       clk_div = pxa2xx_ssp_get_clk_div(drv_data, speed);
+
+       if (bits <= 8) {
+               drv_data->n_bytes = 1;
+               drv_data->read = drv_data->read != null_reader ?
+                                       u8_reader : null_reader;
+               drv_data->write = drv_data->write != null_writer ?
+                                       u8_writer : null_writer;
+       } else if (bits <= 16) {
+               drv_data->n_bytes = 2;
+               drv_data->read = drv_data->read != null_reader ?
+                                       u16_reader : null_reader;
+               drv_data->write = drv_data->write != null_writer ?
+                                       u16_writer : null_writer;
+       } else if (bits <= 32) {
+               drv_data->n_bytes = 4;
+               drv_data->read = drv_data->read != null_reader ?
+                                       u32_reader : null_reader;
+               drv_data->write = drv_data->write != null_writer ?
+                                       u32_writer : null_writer;
        }
+       /*
+        * if bits/word is changed in dma mode, then must check the
+        * thresholds and burst also
+        */
+       if (chip->enable_dma) {
+               if (pxa2xx_spi_set_dma_burst_and_threshold(chip,
+                                               message->spi,
+                                               bits, &dma_burst,
+                                               &dma_thresh))
+                       dev_warn_ratelimited(&message->spi->dev,
+                                            "pump_transfers: DMA burst size reduced to match bits_per_word\n");
+       }
+
+       /* NOTE:  PXA25x_SSP _could_ use external clocking ... */
+       cr0 = pxa2xx_configure_sscr0(drv_data, clk_div, bits);
+       if (!pxa25x_ssp_comp(drv_data))
+               dev_dbg(&message->spi->dev, "%u Hz actual, %s\n",
+                       drv_data->master->max_speed_hz
+                               / (1 + ((cr0 & SSCR0_SCR(0xfff)) >> 8)),
+                       chip->enable_dma ? "DMA" : "PIO");
+       else
+               dev_dbg(&message->spi->dev, "%u Hz actual, %s\n",
+                       drv_data->master->max_speed_hz / 2
+                               / (1 + ((cr0 & SSCR0_SCR(0x0ff)) >> 8)),
+                       chip->enable_dma ? "DMA" : "PIO");
 
        message->state = RUNNING_STATE;
 
@@ -1111,7 +1156,6 @@ static int setup(struct spi_device *spi)
        struct chip_data *chip;
        const struct lpss_config *config;
        struct driver_data *drv_data = spi_master_get_devdata(spi->master);
-       unsigned int clk_div;
        uint tx_thres, tx_hi_thres, rx_thres;
 
        switch (drv_data->ssp_type) {
@@ -1123,6 +1167,7 @@ static int setup(struct spi_device *spi)
        case LPSS_LPT_SSP:
        case LPSS_BYT_SSP:
        case LPSS_SPT_SSP:
+       case LPSS_BXT_SSP:
                config = lpss_get_config(drv_data);
                tx_thres = config->tx_threshold_lo;
                tx_hi_thres = config->tx_threshold_hi;
@@ -1203,11 +1248,6 @@ static int setup(struct spi_device *spi)
                }
        }
 
-       clk_div = pxa2xx_ssp_get_clk_div(drv_data, chip, spi->max_speed_hz);
-       chip->speed_hz = spi->max_speed_hz;
-
-       chip->cr0 = pxa2xx_configure_sscr0(drv_data, clk_div,
-                                          spi->bits_per_word);
        switch (drv_data->ssp_type) {
        case QUARK_X1000_SSP:
                chip->threshold = (QUARK_X1000_SSCR1_RxTresh(rx_thres)
@@ -1228,18 +1268,6 @@ static int setup(struct spi_device *spi)
        if (spi->mode & SPI_LOOP)
                chip->cr1 |= SSCR1_LBM;
 
-       /* NOTE:  PXA25x_SSP _could_ use external clocking ... */
-       if (!pxa25x_ssp_comp(drv_data))
-               dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
-                       drv_data->max_clk_rate
-                               / (1 + ((chip->cr0 & SSCR0_SCR(0xfff)) >> 8)),
-                       chip->enable_dma ? "DMA" : "PIO");
-       else
-               dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
-                       drv_data->max_clk_rate / 2
-                               / (1 + ((chip->cr0 & SSCR0_SCR(0x0ff)) >> 8)),
-                       chip->enable_dma ? "DMA" : "PIO");
-
        if (spi->bits_per_word <= 8) {
                chip->n_bytes = 1;
                chip->read = u8_reader;
@@ -1249,13 +1277,10 @@ static int setup(struct spi_device *spi)
                chip->read = u16_reader;
                chip->write = u16_writer;
        } else if (spi->bits_per_word <= 32) {
-               if (!is_quark_x1000_ssp(drv_data))
-                       chip->cr0 |= SSCR0_EDSS;
                chip->n_bytes = 4;
                chip->read = u32_reader;
                chip->write = u32_writer;
        }
-       chip->bits_per_word = spi->bits_per_word;
 
        spi_set_ctldata(spi, chip);
 
@@ -1279,6 +1304,7 @@ static void cleanup(struct spi_device *spi)
        kfree(chip);
 }
 
+#ifdef CONFIG_PCI
 #ifdef CONFIG_ACPI
 
 static const struct acpi_device_id pxa2xx_spi_acpi_match[] = {
@@ -1292,6 +1318,23 @@ static const struct acpi_device_id pxa2xx_spi_acpi_match[] = {
 };
 MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match);
 
+static int pxa2xx_spi_get_port_id(struct acpi_device *adev)
+{
+       unsigned int devid;
+       int port_id = -1;
+
+       if (adev && adev->pnp.unique_id &&
+           !kstrtouint(adev->pnp.unique_id, 0, &devid))
+               port_id = devid;
+       return port_id;
+}
+#else /* !CONFIG_ACPI */
+static int pxa2xx_spi_get_port_id(struct acpi_device *adev)
+{
+       return -1;
+}
+#endif
+
 /*
  * PCI IDs of compound devices that integrate both host controller and private
  * integrated DMA engine. Please note these are not used in module
@@ -1304,6 +1347,14 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
        /* SPT-H */
        { PCI_VDEVICE(INTEL, 0xa129), LPSS_SPT_SSP },
        { PCI_VDEVICE(INTEL, 0xa12a), LPSS_SPT_SSP },
+       /* BXT */
+       { PCI_VDEVICE(INTEL, 0x0ac2), LPSS_BXT_SSP },
+       { PCI_VDEVICE(INTEL, 0x0ac4), LPSS_BXT_SSP },
+       { PCI_VDEVICE(INTEL, 0x0ac6), LPSS_BXT_SSP },
+       /* APL */
+       { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP },
+       { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },
+       { PCI_VDEVICE(INTEL, 0x5ac6), LPSS_BXT_SSP },
        { },
 };
 
@@ -1318,7 +1369,7 @@ static bool pxa2xx_spi_idma_filter(struct dma_chan *chan, void *param)
 }
 
 static struct pxa2xx_spi_master *
-pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
+pxa2xx_spi_init_pdata(struct platform_device *pdev)
 {
        struct pxa2xx_spi_master *pdata;
        struct acpi_device *adev;
@@ -1326,18 +1377,18 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
        struct resource *res;
        const struct acpi_device_id *adev_id = NULL;
        const struct pci_device_id *pcidev_id = NULL;
-       int devid, type;
+       int type;
 
-       if (!ACPI_HANDLE(&pdev->dev) ||
-           acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev))
-               return NULL;
+       adev = ACPI_COMPANION(&pdev->dev);
 
        if (dev_is_pci(pdev->dev.parent))
                pcidev_id = pci_match_id(pxa2xx_spi_pci_compound_match,
                                         to_pci_dev(pdev->dev.parent));
-       else
+       else if (adev)
                adev_id = acpi_match_device(pdev->dev.driver->acpi_match_table,
                                            &pdev->dev);
+       else
+               return NULL;
 
        if (adev_id)
                type = (int)adev_id->driver_data;
@@ -1371,10 +1422,7 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
        ssp->irq = platform_get_irq(pdev, 0);
        ssp->type = type;
        ssp->pdev = pdev;
-
-       ssp->port_id = -1;
-       if (adev->pnp.unique_id && !kstrtoint(adev->pnp.unique_id, 0, &devid))
-               ssp->port_id = devid;
+       ssp->port_id = pxa2xx_spi_get_port_id(adev);
 
        pdata->num_chipselect = 1;
        pdata->enable_dma = true;
@@ -1382,9 +1430,9 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
        return pdata;
 }
 
-#else
+#else /* !CONFIG_PCI */
 static inline struct pxa2xx_spi_master *
-pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
+pxa2xx_spi_init_pdata(struct platform_device *pdev)
 {
        return NULL;
 }
@@ -1397,12 +1445,13 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        struct spi_master *master;
        struct driver_data *drv_data;
        struct ssp_device *ssp;
+       const struct lpss_config *config;
        int status;
        u32 tmp;
 
        platform_info = dev_get_platdata(dev);
        if (!platform_info) {
-               platform_info = pxa2xx_spi_acpi_get_pdata(pdev);
+               platform_info = pxa2xx_spi_init_pdata(pdev);
                if (!platform_info) {
                        dev_err(&pdev->dev, "missing platform data\n");
                        return -ENODEV;
@@ -1436,7 +1485,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;
 
        master->bus_num = ssp->port_id;
-       master->num_chipselect = platform_info->num_chipselect;
        master->dma_alignment = DMA_ALIGNMENT;
        master->cleanup = cleanup;
        master->setup = setup;
@@ -1489,7 +1537,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        /* Enable SOC clock */
        clk_prepare_enable(ssp->clk);
 
-       drv_data->max_clk_rate = clk_get_rate(ssp->clk);
+       master->max_speed_hz = clk_get_rate(ssp->clk);
 
        /* Load default SSP configuration */
        pxa2xx_spi_write(drv_data, SSCR0, 0);
@@ -1522,6 +1570,19 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        if (is_lpss_ssp(drv_data))
                lpss_ssp_setup(drv_data);
 
+       if (is_lpss_ssp(drv_data)) {
+               lpss_ssp_setup(drv_data);
+               config = lpss_get_config(drv_data);
+               if (config->reg_capabilities >= 0) {
+                       tmp = __lpss_ssp_read_priv(drv_data,
+                                                  config->reg_capabilities);
+                       tmp &= LPSS_CAPS_CS_EN_MASK;
+                       tmp >>= LPSS_CAPS_CS_EN_SHIFT;
+                       platform_info->num_chipselect = ffz(tmp);
+               }
+       }
+       master->num_chipselect = platform_info->num_chipselect;
+
        tasklet_init(&drv_data->pump_transfers, pump_transfers,
                     (unsigned long)drv_data);
 
@@ -1614,8 +1675,6 @@ static int pxa2xx_spi_resume(struct device *dev)
        struct ssp_device *ssp = drv_data->ssp;
        int status = 0;
 
-       pxa2xx_spi_dma_resume(drv_data);
-
        /* Enable the SSP clock */
        if (!pm_runtime_suspended(dev))
                clk_prepare_enable(ssp->clk);
index 0a9b639..58efa98 100644 (file)
@@ -46,9 +46,6 @@ struct driver_data {
        u32 clear_sr;
        u32 mask_sr;
 
-       /* Maximun clock rate */
-       unsigned long max_clk_rate;
-
        /* Message Transfer pump */
        struct tasklet_struct pump_transfers;
 
@@ -86,10 +83,8 @@ struct driver_data {
 };
 
 struct chip_data {
-       u32 cr0;
        u32 cr1;
        u32 dds_rate;
-       u32 psp;
        u32 timeout;
        u8 n_bytes;
        u32 dma_burst_size;
@@ -98,8 +93,6 @@ struct chip_data {
        u16 lpss_rx_threshold;
        u16 lpss_tx_threshold;
        u8 enable_dma;
-       u8 bits_per_word;
-       u32 speed_hz;
        union {
                int gpio_cs;
                unsigned int frm;
@@ -175,7 +168,6 @@ extern int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst);
 extern void pxa2xx_spi_dma_start(struct driver_data *drv_data);
 extern int pxa2xx_spi_dma_setup(struct driver_data *drv_data);
 extern void pxa2xx_spi_dma_release(struct driver_data *drv_data);
-extern void pxa2xx_spi_dma_resume(struct driver_data *drv_data);
 extern int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,
                                                  struct spi_device *spi,
                                                  u8 bits_per_word,
@@ -196,7 +188,6 @@ static inline int pxa2xx_spi_dma_setup(struct driver_data *drv_data)
        return 0;
 }
 static inline void pxa2xx_spi_dma_release(struct driver_data *drv_data) {}
-static inline void pxa2xx_spi_dma_resume(struct driver_data *drv_data) {}
 static inline int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,
                                                         struct spi_device *spi,
                                                         u8 bits_per_word,
index daf5aa1..c6ae775 100644 (file)
@@ -307,7 +307,6 @@ static int tle62x0_remove(struct spi_device *spi)
 static struct spi_driver tle62x0_driver = {
        .driver = {
                .name   = "tle62x0",
-               .owner  = THIS_MODULE,
        },
        .probe          = tle62x0_probe,
        .remove         = tle62x0_remove,
index f9e92f5..e2415be 100644 (file)
@@ -375,14 +375,15 @@ static void spi_drv_shutdown(struct device *dev)
 }
 
 /**
- * spi_register_driver - register a SPI driver
+ * __spi_register_driver - register a SPI driver
  * @sdrv: the driver to register
  * Context: can sleep
  *
  * Return: zero on success, else a negative error code.
  */
-int spi_register_driver(struct spi_driver *sdrv)
+int __spi_register_driver(struct module *owner, struct spi_driver *sdrv)
 {
+       sdrv->driver.owner = owner;
        sdrv->driver.bus = &spi_bus_type;
        if (sdrv->probe)
                sdrv->driver.probe = spi_drv_probe;
@@ -392,7 +393,7 @@ int spi_register_driver(struct spi_driver *sdrv)
                sdrv->driver.shutdown = spi_drv_shutdown;
        return driver_register(&sdrv->driver);
 }
-EXPORT_SYMBOL_GPL(spi_register_driver);
+EXPORT_SYMBOL_GPL(__spi_register_driver);
 
 /*-------------------------------------------------------------------------*/
 
index ef008e5..91a0fcd 100644 (file)
@@ -788,7 +788,6 @@ static int spidev_remove(struct spi_device *spi)
 static struct spi_driver spidev_spi_driver = {
        .driver = {
                .name =         "spidev",
-               .owner =        THIS_MODULE,
                .of_match_table = of_match_ptr(spidev_dt_ids),
        },
        .probe =        spidev_probe,
index 7e9a506..0d27daf 100644 (file)
@@ -333,7 +333,6 @@ MODULE_DEVICE_TABLE(of, dt_ids);                                           \
 static struct spi_driver fbtft_driver_spi_driver = {                       \
        .driver = {                                                        \
                .name   = _name,                                           \
-               .owner  = THIS_MODULE,                                     \
                .of_match_table = of_match_ptr(dt_ids),                    \
        },                                                                 \
        .probe  = fbtft_driver_probe_spi,                                  \
index 3f380a0..86d9223 100644 (file)
@@ -583,7 +583,6 @@ static int flexfb_remove_pdev(struct platform_device *pdev)
 static struct spi_driver flexfb_spi_driver = {
        .driver = {
                .name   = DRVNAME,
-               .owner  = THIS_MODULE,
        },
        .probe  = flexfb_probe_spi,
        .remove = flexfb_remove_spi,
index 10db685..06c0b75 100644 (file)
@@ -235,7 +235,6 @@ static int adis16201_remove(struct spi_device *spi)
 static struct spi_driver adis16201_driver = {
        .driver = {
                .name = "adis16201",
-               .owner = THIS_MODULE,
        },
        .probe = adis16201_probe,
        .remove = adis16201_remove,
index fb593d2..de5b84a 100644 (file)
@@ -203,7 +203,6 @@ static int adis16203_remove(struct spi_device *spi)
 static struct spi_driver adis16203_driver = {
        .driver = {
                .name = "adis16203",
-               .owner = THIS_MODULE,
        },
        .probe = adis16203_probe,
        .remove = adis16203_remove,
index ea0ac24..20a9df6 100644 (file)
@@ -241,7 +241,6 @@ static int adis16204_remove(struct spi_device *spi)
 static struct spi_driver adis16204_driver = {
        .driver = {
                .name = "adis16204",
-               .owner = THIS_MODULE,
        },
        .probe = adis16204_probe,
        .remove = adis16204_remove,
index d1dc1a3..8b42bf8 100644 (file)
@@ -235,7 +235,6 @@ static int adis16209_remove(struct spi_device *spi)
 static struct spi_driver adis16209_driver = {
        .driver = {
                .name = "adis16209",
-               .owner = THIS_MODULE,
        },
        .probe = adis16209_probe,
        .remove = adis16209_remove,
index e46a91c..d016521 100644 (file)
@@ -482,7 +482,6 @@ static int adis16220_remove(struct spi_device *spi)
 static struct spi_driver adis16220_driver = {
        .driver = {
                .name = "adis16220",
-               .owner = THIS_MODULE,
        },
        .probe = adis16220_probe,
        .remove = adis16220_remove,
index cb074e8..1b5b685 100644 (file)
@@ -288,7 +288,6 @@ static int adis16240_remove(struct spi_device *spi)
 static struct spi_driver adis16240_driver = {
        .driver = {
                .name = "adis16240",
-               .owner = THIS_MODULE,
        },
        .probe = adis16240_probe,
        .remove = adis16240_remove,
index ebcab56..24d90b3 100644 (file)
@@ -800,7 +800,6 @@ static int lis3l02dq_remove(struct spi_device *spi)
 static struct spi_driver lis3l02dq_driver = {
        .driver = {
                .name = "lis3l02dq",
-               .owner = THIS_MODULE,
        },
        .probe = lis3l02dq_probe,
        .remove = lis3l02dq_remove,
index b614f27..fda6462 100644 (file)
@@ -1196,7 +1196,6 @@ MODULE_DEVICE_TABLE(spi, sca3000_id);
 static struct spi_driver sca3000_driver = {
        .driver = {
                .name = "sca3000",
-               .owner = THIS_MODULE,
        },
        .probe = sca3000_probe,
        .remove = sca3000_remove,
index fe56fb6..a3b7655 100644 (file)
@@ -707,7 +707,6 @@ MODULE_DEVICE_TABLE(spi, ad7192_id);
 static struct spi_driver ad7192_driver = {
        .driver = {
                .name   = "ad7192",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad7192_probe,
        .remove         = ad7192_remove,
index d98e229..8a7c873 100644 (file)
@@ -972,7 +972,6 @@ MODULE_DEVICE_TABLE(spi, ad7280_id);
 static struct spi_driver ad7280_driver = {
        .driver = {
                .name   = "ad7280",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad7280_probe,
        .remove         = ad7280_remove,
index 7303983..06b59cb 100644 (file)
@@ -102,7 +102,6 @@ MODULE_DEVICE_TABLE(spi, ad7606_id);
 static struct spi_driver ad7606_driver = {
        .driver = {
                .name = "ad7606",
-               .owner = THIS_MODULE,
                .pm    = AD7606_SPI_PM_OPS,
        },
        .probe = ad7606_spi_probe,
index 9f03fe3..b76dd15 100644 (file)
@@ -263,7 +263,6 @@ MODULE_DEVICE_TABLE(spi, ad7780_id);
 static struct spi_driver ad7780_driver = {
        .driver = {
                .name   = "ad7780",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad7780_probe,
        .remove         = ad7780_remove,
index 48b1c37..f3bbb38 100644 (file)
@@ -434,7 +434,6 @@ MODULE_DEVICE_TABLE(spi, ad7816_id);
 static struct spi_driver ad7816_driver = {
        .driver = {
                .name = "ad7816",
-               .owner = THIS_MODULE,
        },
        .probe = ad7816_probe,
        .id_table = ad7816_id,
index e480abb..5cd2274 100644 (file)
@@ -132,7 +132,6 @@ static struct spi_driver adt7316_driver = {
        .driver = {
                .name = "adt7316",
                .pm = ADT7316_PM_OPS,
-               .owner = THIS_MODULE,
        },
        .probe = adt7316_spi_probe,
        .id_table = adt7316_spi_id,
index a861fe0..2b65faa 100644 (file)
@@ -339,7 +339,6 @@ MODULE_DEVICE_TABLE(spi, ad9832_id);
 static struct spi_driver ad9832_driver = {
        .driver = {
                .name   = "ad9832",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad9832_probe,
        .remove         = ad9832_remove,
index d02bb44..15f0cc3 100644 (file)
@@ -446,7 +446,6 @@ MODULE_DEVICE_TABLE(spi, ad9834_id);
 static struct spi_driver ad9834_driver = {
        .driver = {
                .name   = "ad9834",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad9834_probe,
        .remove         = ad9834_remove,
index 4c5869d..b8776d6 100644 (file)
@@ -202,7 +202,6 @@ static int adis16060_w_remove(struct spi_device *spi)
 static struct spi_driver adis16060_r_driver = {
        .driver = {
                .name = "adis16060_r",
-               .owner = THIS_MODULE,
        },
        .probe = adis16060_r_probe,
 };
@@ -210,7 +209,6 @@ static struct spi_driver adis16060_r_driver = {
 static struct spi_driver adis16060_w_driver = {
        .driver = {
                .name = "adis16060_w",
-               .owner = THIS_MODULE,
        },
        .probe = adis16060_w_probe,
        .remove = adis16060_w_remove,
index 8e658f7..070c918 100644 (file)
@@ -86,7 +86,6 @@ static struct spi_driver hmc5843_driver = {
                .driver = {
                                .name = "hmc5843",
                                .pm = HMC5843_PM_OPS,
-                               .owner = THIS_MODULE,
                },
                .id_table = hmc5843_id,
                .probe = hmc5843_spi_probe,
index ffc7f0d..9ca9fef 100644 (file)
@@ -534,7 +534,6 @@ static int ade7753_remove(struct spi_device *spi)
 static struct spi_driver ade7753_driver = {
        .driver = {
                .name = "ade7753",
-               .owner = THIS_MODULE,
        },
        .probe = ade7753_probe,
        .remove = ade7753_remove,
index f12b2e5..5609872 100644 (file)
@@ -575,7 +575,6 @@ static int ade7754_remove(struct spi_device *spi)
 static struct spi_driver ade7754_driver = {
        .driver = {
                .name = "ade7754",
-               .owner = THIS_MODULE,
        },
        .probe = ade7754_probe,
        .remove = ade7754_remove,
index 77141ae..d348e16 100644 (file)
@@ -904,7 +904,6 @@ MODULE_DEVICE_TABLE(spi, ade7758_id);
 static struct spi_driver ade7758_driver = {
        .driver = {
                .name = "ade7758",
-               .owner = THIS_MODULE,
        },
        .probe = ade7758_probe,
        .remove = ade7758_remove,
index dbceda1..f774a62 100644 (file)
@@ -490,7 +490,6 @@ static int ade7759_remove(struct spi_device *spi)
 static struct spi_driver ade7759_driver = {
        .driver = {
                .name = "ade7759",
-               .owner = THIS_MODULE,
        },
        .probe = ade7759_probe,
        .remove = ade7759_remove,
index 9b255a5..16f288d 100644 (file)
@@ -314,7 +314,6 @@ MODULE_DEVICE_TABLE(spi, ade7854_id);
 static struct spi_driver ade7854_driver = {
        .driver = {
                .name = "ade7854",
-               .owner = THIS_MODULE,
        },
        .probe = ade7854_spi_probe,
        .remove = ade7854_spi_remove,
index c17893b..595e711 100644 (file)
@@ -155,7 +155,6 @@ MODULE_DEVICE_TABLE(spi, ad2s1200_id);
 static struct spi_driver ad2s1200_driver = {
        .driver = {
                .name = DRV_NAME,
-               .owner = THIS_MODULE,
        },
        .probe = ad2s1200_probe,
        .id_table = ad2s1200_id,
index 7bc3e4a..95f5426 100644 (file)
@@ -735,7 +735,6 @@ MODULE_DEVICE_TABLE(spi, ad2s1210_id);
 static struct spi_driver ad2s1210_driver = {
        .driver = {
                .name = DRV_NAME,
-               .owner = THIS_MODULE,
        },
        .probe = ad2s1210_probe,
        .remove = ad2s1210_remove,
index e24c589..cfeedfb 100644 (file)
@@ -107,7 +107,6 @@ MODULE_DEVICE_TABLE(spi, ad2s90_id);
 static struct spi_driver ad2s90_driver = {
        .driver = {
                .name = "ad2s90",
-               .owner = THIS_MODULE,
        },
        .probe = ad2s90_probe,
        .remove = ad2s90_remove,
index ad30ce4..5a0e773 100644 (file)
@@ -948,7 +948,6 @@ static const struct of_device_id spinand_dt[] = {
 static struct spi_driver spinand_driver = {
        .driver = {
                .name           = "mt29f",
-               .owner          = THIS_MODULE,
                .of_match_table = spinand_dt,
        },
        .probe          = spinand_probe,
index 536a33b..88246f7 100644 (file)
@@ -1362,7 +1362,7 @@ static struct spi_driver ifx_spi_driver = {
        .driver = {
                .name = DRVNAME,
                .pm = &ifx_spi_pm,
-               .owner = THIS_MODULE},
+       },
        .probe = ifx_spi_spi_probe,
        .shutdown = ifx_spi_spi_shutdown,
        .remove = ifx_spi_spi_remove,
index 0773772..5c4c280 100644 (file)
@@ -904,7 +904,6 @@ static SIMPLE_DEV_PM_OPS(max3100_pm_ops, max3100_suspend, max3100_resume);
 static struct spi_driver max3100_driver = {
        .driver = {
                .name           = "max3100",
-               .owner          = THIS_MODULE,
                .pm             = MAX3100_PM_OPS,
        },
        .probe          = max3100_probe,
index 182549f..d451330 100644 (file)
@@ -1338,7 +1338,6 @@ MODULE_DEVICE_TABLE(spi, max310x_id_table);
 static struct spi_driver max310x_uart_driver = {
        .driver = {
                .name           = MAX310X_NAME,
-               .owner          = THIS_MODULE,
                .of_match_table = of_match_ptr(max310x_dt_ids),
                .pm             = &max310x_pm_ops,
        },
index 72ffd0d..55b61d7 100644 (file)
@@ -1357,7 +1357,6 @@ MODULE_DEVICE_TABLE(spi, sc16is7xx_spi_id_table);
 static struct spi_driver sc16is7xx_spi_uart_driver = {
        .driver = {
                .name           = SC16IS7XX_NAME,
-               .owner          = THIS_MODULE,
                .of_match_table = of_match_ptr(sc16is7xx_dt_ids),
        },
        .probe          = sc16is7xx_spi_probe,
index fc1fd40..bd98706 100644 (file)
@@ -1944,7 +1944,6 @@ static struct spi_driver max3421_driver = {
        .remove         = max3421_remove,
        .driver         = {
                .name   = "max3421-hcd",
-               .owner  = THIS_MODULE,
        },
 };
 
index 5f897f9..5cca8ce 100644 (file)
@@ -556,7 +556,6 @@ static void ams369fg06_shutdown(struct spi_device *spi)
 static struct spi_driver ams369fg06_driver = {
        .driver = {
                .name   = "ams369fg06",
-               .owner  = THIS_MODULE,
                .pm     = &ams369fg06_pm_ops,
        },
        .probe          = ams369fg06_probe,
index d7c37a8..d7c239e 100644 (file)
@@ -598,7 +598,6 @@ static int corgi_lcd_remove(struct spi_device *spi)
 static struct spi_driver corgi_lcd_driver = {
        .driver         = {
                .name   = "corgi-lcd",
-               .owner  = THIS_MODULE,
                .pm     = &corgi_lcd_pm_ops,
        },
        .probe          = corgi_lcd_probe,
index e7f0890..a9e9cef 100644 (file)
@@ -536,7 +536,6 @@ static int ili922x_remove(struct spi_device *spi)
 static struct spi_driver ili922x_driver = {
        .driver = {
                .name = "ili922x",
-               .owner = THIS_MODULE,
        },
        .probe = ili922x_probe,
        .remove = ili922x_remove,
index 5fa2649..e6054e2 100644 (file)
@@ -255,7 +255,6 @@ static void l4f00242t03_shutdown(struct spi_device *spi)
 static struct spi_driver l4f00242t03_driver = {
        .driver = {
                .name   = "l4f00242t03",
-               .owner  = THIS_MODULE,
        },
        .probe          = l4f00242t03_probe,
        .remove         = l4f00242t03_remove,
index f71eaf1..677f8ab 100644 (file)
@@ -797,7 +797,6 @@ static void ld9040_shutdown(struct spi_device *spi)
 static struct spi_driver ld9040_driver = {
        .driver = {
                .name   = "ld9040",
-               .owner  = THIS_MODULE,
                .pm     = &ld9040_pm_ops,
        },
        .probe          = ld9040_probe,
index 14590c5..4237aaa 100644 (file)
@@ -192,7 +192,6 @@ static int lms283gf05_probe(struct spi_device *spi)
 static struct spi_driver lms283gf05_driver = {
        .driver = {
                .name   = "lms283gf05",
-               .owner  = THIS_MODULE,
        },
        .probe          = lms283gf05_probe,
 };
index 7e38103..8aa3e76 100644 (file)
@@ -422,7 +422,6 @@ static void lms501kf03_shutdown(struct spi_device *spi)
 static struct spi_driver lms501kf03_driver = {
        .driver = {
                .name   = "lms501kf03",
-               .owner  = THIS_MODULE,
                .pm     = &lms501kf03_pm_ops,
        },
        .probe          = lms501kf03_probe,
index 383f550..885612c 100644 (file)
@@ -295,7 +295,6 @@ static void ltv350qv_shutdown(struct spi_device *spi)
 static struct spi_driver ltv350qv_driver = {
        .driver = {
                .name           = "ltv350qv",
-               .owner          = THIS_MODULE,
                .pm             = &ltv350qv_pm_ops,
        },
 
index 28bfa12..3c4a22a 100644 (file)
@@ -842,7 +842,6 @@ static void s6e63m0_shutdown(struct spi_device *spi)
 static struct spi_driver s6e63m0_driver = {
        .driver = {
                .name   = "s6e63m0",
-               .owner  = THIS_MODULE,
                .pm     = &s6e63m0_pm_ops,
        },
        .probe          = s6e63m0_probe,
index 30afce3..eab1f84 100644 (file)
@@ -437,7 +437,6 @@ static void tdo24m_shutdown(struct spi_device *spi)
 static struct spi_driver tdo24m_driver = {
        .driver = {
                .name           = "tdo24m",
-               .owner          = THIS_MODULE,
                .pm             = &tdo24m_pm_ops,
        },
        .probe          = tdo24m_probe,
index f08d641..6a41ea9 100644 (file)
@@ -263,7 +263,6 @@ static SIMPLE_DEV_PM_OPS(tosa_lcd_pm_ops, tosa_lcd_suspend, tosa_lcd_resume);
 static struct spi_driver tosa_lcd_driver = {
        .driver = {
                .name           = "tosa-lcd",
-               .owner          = THIS_MODULE,
                .pm             = &tosa_lcd_pm_ops,
        },
        .probe          = tosa_lcd_probe,
index d538947..242a994 100644 (file)
@@ -251,7 +251,6 @@ static SIMPLE_DEV_PM_OPS(vgg2432a4_pm_ops, vgg2432a4_suspend, vgg2432a4_resume);
 static struct spi_driver vgg2432a4_driver = {
        .driver = {
                .name           = "VGG2432A4",
-               .owner          = THIS_MODULE,
                .pm             = &vgg2432a4_pm_ops,
        },
        .probe          = vgg2432a4_probe,
index 998978b..f7e85d1 100644 (file)
@@ -175,7 +175,6 @@ static int tpohvga_probe(struct spi_device *spi)
 static struct spi_driver panel_tpohvga_driver = {
        .driver         = {
                .name   = "tpo-hvga",
-               .owner  = THIS_MODULE,
        },
        .probe          = tpohvga_probe,
 };
index 803fee6..0e4cee9 100644 (file)
@@ -603,7 +603,6 @@ static int mipid_spi_remove(struct spi_device *spi)
 static struct spi_driver mipid_spi_driver = {
        .driver = {
                .name   = MIPID_MODULE_NAME,
-               .owner  = THIS_MODULE,
        },
        .probe  = mipid_spi_probe,
        .remove = mipid_spi_remove,
index 6a1b6a8..18eb60e 100644 (file)
@@ -391,7 +391,6 @@ static struct spi_driver lb035q02_spi_driver = {
        .remove         = lb035q02_panel_spi_remove,
        .driver         = {
                .name   = "panel_lgphilips_lb035q02",
-               .owner  = THIS_MODULE,
                .of_match_table = lb035q02_of_match,
                .suppress_bind_attrs = true,
        },
index ccf3f4f..8a928c9 100644 (file)
@@ -421,7 +421,6 @@ MODULE_DEVICE_TABLE(of, nec_8048_of_match);
 static struct spi_driver nec_8048_driver = {
        .driver = {
                .name   = "panel-nec-nl8048hl11",
-               .owner  = THIS_MODULE,
                .pm     = NEC_8048_PM_OPS,
                .of_match_table = nec_8048_of_match,
                .suppress_bind_attrs = true,
index c581231..31efcca 100644 (file)
@@ -903,7 +903,6 @@ MODULE_DEVICE_TABLE(of, acx565akm_of_match);
 static struct spi_driver acx565akm_driver = {
        .driver = {
                .name   = "acx565akm",
-               .owner  = THIS_MODULE,
                .of_match_table = acx565akm_of_match,
                .suppress_bind_attrs = true,
        },
index 9edc511..4d657f3 100644 (file)
@@ -498,7 +498,6 @@ static struct spi_driver td028ttec1_spi_driver = {
 
        .driver         = {
                .name   = "panel-tpo-td028ttec1",
-               .owner  = THIS_MODULE,
                .of_match_table = td028ttec1_of_match,
                .suppress_bind_attrs = true,
        },
index 79e4a02..68e3b68 100644 (file)
@@ -670,7 +670,6 @@ MODULE_DEVICE_TABLE(of, tpo_td043_of_match);
 static struct spi_driver tpo_td043_spi_driver = {
        .driver = {
                .name   = "panel-tpo-td043mtea1",
-               .owner  = THIS_MODULE,
                .pm     = &tpo_td043_spi_pm,
                .of_match_table = tpo_td043_of_match,
                .suppress_bind_attrs = true,
index 9227377..c2f2574 100644 (file)
@@ -198,6 +198,7 @@ enum pxa_ssp_type {
        LPSS_LPT_SSP, /* Keep LPSS types sorted with lpss_platforms[] */
        LPSS_BYT_SSP,
        LPSS_SPT_SSP,
+       LPSS_BXT_SSP,
 };
 
 struct ssp_device {
index 635bff6..cce80e6 100644 (file)
@@ -254,7 +254,7 @@ static inline struct spi_driver *to_spi_driver(struct device_driver *drv)
        return drv ? container_of(drv, struct spi_driver, driver) : NULL;
 }
 
-extern int spi_register_driver(struct spi_driver *sdrv);
+extern int __spi_register_driver(struct module *owner, struct spi_driver *sdrv);
 
 /**
  * spi_unregister_driver - reverse effect of spi_register_driver
@@ -267,6 +267,10 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
                driver_unregister(&sdrv->driver);
 }
 
+/* use a define to avoid include chaining to get THIS_MODULE */
+#define spi_register_driver(driver) \
+       __spi_register_driver(THIS_MODULE, driver)
+
 /**
  * module_spi_driver() - Helper macro for registering a SPI driver
  * @__spi_driver: spi_driver struct
index 95f0bec..e2ce6c4 100644 (file)
@@ -404,7 +404,6 @@ MODULE_DEVICE_TABLE(spi, ad1836_ids);
 static struct spi_driver ad1836_spi_driver = {
        .driver = {
                .name   = "ad1836",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad1836_spi_probe,
        .remove         = ad1836_spi_remove,
index 390cef9..8199a3d 100644 (file)
@@ -36,7 +36,6 @@ static int ad193x_spi_remove(struct spi_device *spi)
 static struct spi_driver ad193x_spi_driver = {
        .driver = {
                .name   = "ad193x",
-               .owner  = THIS_MODULE,
        },
        .probe          = ad193x_spi_probe,
        .remove         = ad193x_spi_remove,
index cce2f11..8bc1fbd 100644 (file)
@@ -64,7 +64,6 @@ MODULE_DEVICE_TABLE(spi, adau1761_spi_id);
 static struct spi_driver adau1761_spi_driver = {
        .driver = {
                .name = "adau1761",
-               .owner = THIS_MODULE,
        },
        .probe = adau1761_spi_probe,
        .remove = adau1761_spi_remove,
index 1946867..33a73ff 100644 (file)
@@ -62,7 +62,6 @@ MODULE_DEVICE_TABLE(spi, adau1781_spi_id);
 static struct spi_driver adau1781_spi_driver = {
        .driver = {
                .name = "adau1781",
-               .owner = THIS_MODULE,
        },
        .probe = adau1781_spi_probe,
        .remove = adau1781_spi_remove,
index b05cf5d..0b46d88 100644 (file)
@@ -63,7 +63,6 @@ MODULE_DEVICE_TABLE(spi, adau1977_spi_ids);
 static struct spi_driver adau1977_spi_driver = {
        .driver = {
                .name = "adau1977",
-               .owner = THIS_MODULE,
        },
        .probe = adau1977_spi_probe,
        .remove = adau1977_spi_remove,
index 790fce3..055f122 100644 (file)
@@ -39,7 +39,6 @@ static int adav80x_spi_remove(struct spi_device *spi)
 static struct spi_driver adav80x_spi_driver = {
        .driver = {
                .name   = "adav801",
-               .owner  = THIS_MODULE,
        },
        .probe          = adav80x_spi_probe,
        .remove         = adav80x_spi_remove,
index 1fd7f72..595d02d 100644 (file)
@@ -344,7 +344,6 @@ MODULE_DEVICE_TABLE(spi, ak4104_id_table);
 static struct spi_driver ak4104_spi_driver = {
        .driver  = {
                .name   = "ak4104",
-               .owner  = THIS_MODULE,
                .of_match_table = ak4104_of_match,
        },
        .id_table = ak4104_id_table,
index acd49d8..1ff5f52 100644 (file)
@@ -42,7 +42,6 @@ static int cs4271_spi_remove(struct spi_device *spi)
 static struct spi_driver cs4271_spi_driver = {
        .driver = {
                .name   = "cs4271",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(cs4271_dt_ids),
        },
        .probe          = cs4271_spi_probe,
index 7dc52fe..af23a61 100644 (file)
@@ -1339,7 +1339,6 @@ static int da7210_spi_remove(struct spi_device *spi)
 static struct spi_driver da7210_spi_driver = {
        .driver = {
                .name = "da7210",
-               .owner = THIS_MODULE,
        },
        .probe = da7210_spi_probe,
        .remove = da7210_spi_remove
index 57b0c94..08bb486 100644 (file)
@@ -257,7 +257,6 @@ MODULE_DEVICE_TABLE(spi, pcm1792a_spi_ids);
 static struct spi_driver pcm1792a_codec_driver = {
        .driver = {
                .name = "pcm1792a",
-               .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(pcm1792a_of_match),
        },
        .id_table = pcm1792a_spi_ids,
index 7b64a9c..712ed65 100644 (file)
@@ -64,7 +64,6 @@ static struct spi_driver pcm512x_spi_driver = {
        .id_table       = pcm512x_spi_id,
        .driver = {
                .name   = "pcm512x",
-               .owner  = THIS_MODULE,
                .of_match_table = pcm512x_of_match,
                .pm     = &pcm512x_pm_ops,
        },
index 3505aaf..91879ea 100644 (file)
@@ -232,7 +232,6 @@ static int rt5677_spi_probe(struct spi_device *spi)
 static struct spi_driver rt5677_spi_driver = {
        .driver = {
                .name = "rt5677",
-               .owner = THIS_MODULE,
        },
        .probe = rt5677_spi_probe,
 };
index b5df14f..842f373 100644 (file)
@@ -35,7 +35,6 @@ MODULE_DEVICE_TABLE(of, ssm2602_of_match);
 static struct spi_driver ssm2602_spi_driver = {
        .driver = {
                .name   = "ssm2602",
-               .owner  = THIS_MODULE,
                .of_match_table = ssm2602_of_match,
        },
        .probe          = ssm2602_spi_probe,
index 3b387e4..f801ae0 100644 (file)
@@ -43,7 +43,6 @@ static int aic23_spi_remove(struct spi_device *spi)
 static struct spi_driver aic23_spi = {
        .driver = {
                .name = "tlv320aic23",
-               .owner = THIS_MODULE,
        },
        .probe = aic23_spi_probe,
        .remove = aic23_spi_remove,
index 620ab9e..2c904d7 100644 (file)
@@ -373,7 +373,6 @@ static int aic26_spi_remove(struct spi_device *spi)
 static struct spi_driver aic26_spi = {
        .driver = {
                .name = "tlv320aic26-codec",
-               .owner = THIS_MODULE,
        },
        .probe = aic26_spi_probe,
        .remove = aic26_spi_remove,
index 581ec15..e3c34bd 100644 (file)
@@ -998,7 +998,6 @@ static int wm0010_spi_remove(struct spi_device *spi)
 static struct spi_driver wm0010_spi_driver = {
        .driver = {
                .name   = "wm0010",
-               .owner  = THIS_MODULE,
        },
        .probe          = wm0010_spi_probe,
        .remove         = wm0010_spi_remove,
index b098a83..99e40e6 100644 (file)
@@ -644,7 +644,6 @@ static int wm8510_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8510_spi_driver = {
        .driver = {
                .name   = "wm8510",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8510_of_match,
        },
        .probe          = wm8510_spi_probe,
index 44b9e0a..c759ec0 100644 (file)
@@ -431,7 +431,6 @@ static int wm8711_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8711_spi_driver = {
        .driver = {
                .name   = "wm8711",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8711_of_match,
        },
        .probe          = wm8711_spi_probe,
index cd7b024..1564e69 100644 (file)
@@ -272,7 +272,6 @@ static int wm8728_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8728_spi_driver = {
        .driver = {
                .name   = "wm8728",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8728_of_match,
        },
        .probe          = wm8728_spi_probe,
index ace8645..15bd547 100644 (file)
@@ -718,7 +718,6 @@ static int wm8731_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8731_spi_driver = {
        .driver = {
                .name   = "wm8731",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8731_of_match,
        },
        .probe          = wm8731_spi_probe,
index e4a03d9..e780760 100644 (file)
@@ -707,7 +707,6 @@ static int wm8737_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8737_spi_driver = {
        .driver = {
                .name   = "wm8737",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8737_of_match,
        },
        .probe          = wm8737_spi_probe,
index de42c03..36ef91f 100644 (file)
@@ -657,7 +657,6 @@ static int wm8741_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8741_spi_driver = {
        .driver = {
                .name   = "wm8741",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8741_of_match,
        },
        .probe          = wm8741_spi_probe,
index 873933a..bd9dcd2 100644 (file)
@@ -777,7 +777,6 @@ MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);
 static struct spi_driver wm8750_spi_driver = {
        .driver = {
                .name   = "wm8750",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8750_of_match,
        },
        .id_table       = wm8750_spi_ids,
index a801c6d..61299ca 100644 (file)
@@ -1549,7 +1549,6 @@ static int wm8753_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8753_spi_driver = {
        .driver = {
                .name   = "wm8753",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8753_of_match,
        },
        .probe          = wm8753_spi_probe,
index 66c1f15..df61784 100644 (file)
@@ -703,7 +703,6 @@ static int wm8770_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8770_spi_driver = {
        .driver = {
                .name = "wm8770",
-               .owner = THIS_MODULE,
                .of_match_table = wm8770_of_match,
        },
        .probe = wm8770_spi_probe,
index 183c9a4..5af44f9 100644 (file)
@@ -488,7 +488,6 @@ static int wm8776_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8776_spi_driver = {
        .driver = {
                .name   = "wm8776",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8776_of_match,
        },
        .probe          = wm8776_spi_probe,
index 407a3cf..9998c78 100644 (file)
@@ -42,7 +42,6 @@ MODULE_DEVICE_TABLE(of, wm8804_of_match);
 static struct spi_driver wm8804_spi_driver = {
        .driver = {
                .name = "wm8804",
-               .owner = THIS_MODULE,
                .pm = &wm8804_pm,
                .of_match_table = wm8804_of_match,
        },
index 98900aa..5d8dca8 100644 (file)
@@ -1266,7 +1266,6 @@ static int wm8900_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8900_spi_driver = {
        .driver = {
                .name   = "wm8900",
-               .owner  = THIS_MODULE,
        },
        .probe          = wm8900_spi_probe,
        .remove         = wm8900_spi_remove,
index f3193fb..7350ff6 100644 (file)
@@ -1033,7 +1033,6 @@ static int wm8983_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8983_spi_driver = {
        .driver = {
                .name = "wm8983",
-               .owner = THIS_MODULE,
        },
        .probe = wm8983_spi_probe,
        .remove = wm8983_spi_remove
index 9c3c151..9918152 100644 (file)
@@ -1096,7 +1096,6 @@ static int wm8985_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8985_spi_driver = {
        .driver = {
                .name = "wm8985",
-               .owner = THIS_MODULE,
        },
        .probe = wm8985_spi_probe,
        .remove = wm8985_spi_remove
index c88ce99..895721a 100644 (file)
@@ -871,7 +871,6 @@ static int wm8988_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8988_spi_driver = {
        .driver = {
                .name   = "wm8988",
-               .owner  = THIS_MODULE,
        },
        .probe          = wm8988_spi_probe,
        .remove         = wm8988_spi_remove,
index eda52a9..24500ba 100644 (file)
@@ -2246,7 +2246,6 @@ static int wm8995_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8995_spi_driver = {
        .driver = {
                .name = "wm8995",
-               .owner = THIS_MODULE,
        },
        .probe = wm8995_spi_probe,
        .remove = wm8995_spi_remove