Merge remote-tracking branch 'spi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:40:03 +0000 (13:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:40:03 +0000 (13:40 +1100)
17 files changed:
1  2 
drivers/input/misc/ad714x-spi.c
drivers/input/touchscreen/ads7846.c
drivers/input/touchscreen/tsc2005.c
drivers/media/i2c/s5c73m3/s5c73m3-spi.c
drivers/mfd/arizona-spi.c
drivers/mfd/da9052-spi.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/ieee802154/at86rf230.c
drivers/net/ieee802154/mrf24j40.c
drivers/nfc/st-nci/spi.c
drivers/nfc/trf7970a.c
drivers/staging/mt29f_spinand/mt29f_spinand.c
sound/soc/codecs/ad193x-spi.c
sound/soc/codecs/wm8731.c

Simple merge
Simple merge
@@@ -75,8 -750,9 +75,7 @@@ static int tsc2005_remove(struct spi_de
  static struct spi_driver tsc2005_driver = {
        .driver = {
                .name   = "tsc2005",
-               .owner  = THIS_MODULE,
 -              .pm     = &tsc2005_pm_ops,
 +              .pm     = &tsc200x_pm_ops,
        },
        .probe  = tsc2005_probe,
        .remove = tsc2005_remove,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1380,9 -811,7 +1380,8 @@@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids)
  
  static struct spi_driver mrf24j40_driver = {
        .driver = {
 +              .of_match_table = of_match_ptr(mrf24j40_of_match),
                .name = "mrf24j40",
-               .owner = THIS_MODULE,
        },
        .id_table = mrf24j40_ids,
        .probe = mrf24j40_probe,
Simple merge
@@@ -2229,8 -2223,6 +2229,7 @@@ static struct spi_driver trf7970a_spi_d
        .id_table       = trf7970a_id_table,
        .driver         = {
                .name   = "trf7970a",
-               .owner  = THIS_MODULE,
 +              .of_match_table = of_match_ptr(trf7970a_of_match),
                .pm     = &trf7970a_pm_ops,
        },
  };
Simple merge
Simple merge