From: Stephen Rothwell Date: Thu, 5 Nov 2015 03:52:43 +0000 (+1100) Subject: Merge remote-tracking branch 'staging/staging-next' X-Git-Tag: KARO-TXUL-2015-12-04~50 X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=25912ee10d64eba7f267b475afcf5d6ad4249ab3 Merge remote-tracking branch 'staging/staging-next' --- 25912ee10d64eba7f267b475afcf5d6ad4249ab3 diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index abc34e3652ea,13e54a0e78b9..55df1d444e9f --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@@ -171,8 -169,8 +172,9 @@@ pericom Pericom Technology Inc phytec PHYTEC Messtechnik GmbH picochip Picochip Ltd plathome Plat'Home Co., Ltd. +plda PLDA pixcir PIXCIR MICROELECTRONICS Co., Ltd + pulsedlight PulsedLight, Inc powervr PowerVR (deprecated, use img) qca Qualcomm Atheros, Inc. qcom Qualcomm Technologies, Inc @@@ -195,8 -193,8 +197,9 @@@ sbs Smart Battery Syste schindler Schindler seagate Seagate Technology PLC semtech Semtech Corporation + sgx SGX Sensortech sharp Sharp Corporation +sigma Sigma Designs, Inc. sil Silicon Image silabs Silicon Laboratories siliconmitus Silicon Mitus, Inc. @@@ -227,8 -225,8 +230,9 @@@ toradex Toradex A toshiba Toshiba Corporation toumaz Toumaz tplink TP-LINK Technologies Co., Ltd. +tronfy Tronfy truly Truly Semiconductors Limited + upisemi uPI Semiconductor Corp. usi Universal Scientific Industrial Co., Ltd. v3 V3 Semiconductor variscite Variscite Ltd. diff --cc drivers/iio/adc/max1027.c index 3bc059c69824,54a8302aaace..41d495c6035e --- a/drivers/iio/adc/max1027.c +++ b/drivers/iio/adc/max1027.c @@@ -508,6 -508,8 +508,7 @@@ static int max1027_remove(struct spi_de static struct spi_driver max1027_driver = { .driver = { .name = "max1027", + .of_match_table = of_match_ptr(max1027_adc_dt_ids), - .owner = THIS_MODULE, }, .probe = max1027_probe, .remove = max1027_remove, diff --cc drivers/iio/adc/mcp320x.c index d5d8b4180914,41a21e986c1a..8569c8e1f4b2 --- a/drivers/iio/adc/mcp320x.c +++ b/drivers/iio/adc/mcp320x.c @@@ -404,6 -404,8 +404,7 @@@ MODULE_DEVICE_TABLE(spi, mcp320x_id) static struct spi_driver mcp320x_driver = { .driver = { .name = "mcp320x", + .of_match_table = of_match_ptr(mcp320x_dt_ids), - .owner = THIS_MODULE, }, .probe = mcp320x_probe, .remove = mcp320x_remove, diff --cc drivers/iio/adc/ti-adc128s052.c index 76b619649409,98c0d2b444bf..ff6f7f63c8d9 --- a/drivers/iio/adc/ti-adc128s052.c +++ b/drivers/iio/adc/ti-adc128s052.c @@@ -184,6 -191,8 +191,7 @@@ MODULE_DEVICE_TABLE(spi, adc128_id) static struct spi_driver adc128_driver = { .driver = { .name = "adc128s052", + .of_match_table = of_match_ptr(adc128_of_match), - .owner = THIS_MODULE, }, .probe = adc128_probe, .remove = adc128_remove, diff --cc drivers/iio/dac/ad7303.c index 399de2cfeb16,18a4ad5ff8c5..e690dd11e99f --- a/drivers/iio/dac/ad7303.c +++ b/drivers/iio/dac/ad7303.c @@@ -290,6 -296,8 +296,7 @@@ MODULE_DEVICE_TABLE(spi, ad7303_spi_ids static struct spi_driver ad7303_driver = { .driver = { .name = "ad7303", + .of_match_table = of_match_ptr(ad7303_spi_of_match), - .owner = THIS_MODULE, }, .probe = ad7303_probe, .remove = ad7303_remove, diff --cc drivers/iio/frequency/adf4350.c index b83534cc2ab1,73f27e0a08dd..d2d824b446f5 --- a/drivers/iio/frequency/adf4350.c +++ b/drivers/iio/frequency/adf4350.c @@@ -625,6 -633,8 +633,7 @@@ MODULE_DEVICE_TABLE(spi, adf4350_id) static struct spi_driver adf4350_driver = { .driver = { .name = "adf4350", + .of_match_table = of_match_ptr(adf4350_of_match), - .owner = THIS_MODULE, }, .probe = adf4350_probe, .remove = adf4350_remove, diff --cc drivers/iio/proximity/as3935.c index 2865aa63f4f1,e95035136889..f4d29d5dbd5f --- a/drivers/iio/proximity/as3935.c +++ b/drivers/iio/proximity/as3935.c @@@ -443,6 -449,8 +449,7 @@@ MODULE_DEVICE_TABLE(spi, as3935_id) static struct spi_driver as3935_driver = { .driver = { .name = "as3935", + .of_match_table = of_match_ptr(as3935_of_match), - .owner = THIS_MODULE, .pm = AS3935_PM_OPS, }, .probe = as3935_probe, diff --cc drivers/staging/iio/resolver/ad2s90.c index cfeedfb7c774,c57a29616223..5b1c0db33e7f --- a/drivers/staging/iio/resolver/ad2s90.c +++ b/drivers/staging/iio/resolver/ad2s90.c @@@ -107,9 -100,9 +100,8 @@@ MODULE_DEVICE_TABLE(spi, ad2s90_id) static struct spi_driver ad2s90_driver = { .driver = { .name = "ad2s90", - .owner = THIS_MODULE, }, .probe = ad2s90_probe, - .remove = ad2s90_remove, .id_table = ad2s90_id, }; module_spi_driver(ad2s90_driver); diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h index 993d1ff9ba21,5f78b42b427a..263db37de7c8 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h @@@ -511,30 -490,28 +492,28 @@@ typedef struct kib_r typedef struct kib_tx /* transmit message */ { - struct list_head tx_list; /* queue on idle_txs ibc_tx_queue - * etc. */ - kib_tx_pool_t *tx_pool; /* pool I'm from */ - struct kib_conn *tx_conn; /* owning conn */ - short tx_sending; /* # tx callbacks outstanding */ - short tx_queued; /* queued for sending */ - short tx_waiting; /* waiting for peer */ - int tx_status; /* LNET completion status */ - unsigned long tx_deadline; /* completion deadline */ - __u64 tx_cookie; /* completion cookie */ - lnet_msg_t *tx_lntmsg[2]; /* lnet msgs to finalize on - * completion */ - kib_msg_t *tx_msg; /* message buffer (host vaddr) */ - __u64 tx_msgaddr; /* message buffer (I/O addr) */ + struct list_head tx_list; /* queue on idle_txs ibc_tx_queue etc. */ + kib_tx_pool_t *tx_pool; /* pool I'm from */ + struct kib_conn *tx_conn; /* owning conn */ + short tx_sending; /* # tx callbacks outstanding */ + short tx_queued; /* queued for sending */ + short tx_waiting; /* waiting for peer */ + int tx_status; /* LNET completion status */ + unsigned long tx_deadline; /* completion deadline */ + __u64 tx_cookie; /* completion cookie */ + lnet_msg_t *tx_lntmsg[2]; /* lnet msgs to finalize on completion */ + kib_msg_t *tx_msg; /* message buffer (host vaddr) */ + __u64 tx_msgaddr; /* message buffer (I/O addr) */ DECLARE_PCI_UNMAP_ADDR(tx_msgunmap); /* for dma_unmap_single() */ - int tx_nwrq; /* # send work items */ - struct ib_rdma_wr *tx_wrq; /* send work items... */ - struct ib_sge *tx_sge; /* ...and their memory */ - kib_rdma_desc_t *tx_rd; /* rdma descriptor */ - int tx_nfrags; /* # entries in... */ - struct scatterlist *tx_frags; /* dma_map_sg descriptor */ - __u64 *tx_pages; /* rdma phys page addrs */ - kib_fmr_t fmr; /* FMR */ - int tx_dmadir; /* dma direction */ + int tx_nwrq; /* # send work items */ - struct ib_send_wr *tx_wrq; /* send work items... */ ++ struct ib_rdma_wr *tx_wrq; /* send work items... */ + struct ib_sge *tx_sge; /* ...and their memory */ + kib_rdma_desc_t *tx_rd; /* rdma descriptor */ + int tx_nfrags; /* # entries in... */ + struct scatterlist *tx_frags; /* dma_map_sg descriptor */ + __u64 *tx_pages; /* rdma phys page addrs */ + kib_fmr_t fmr; /* FMR */ + int tx_dmadir; /* dma direction */ } kib_tx_t; typedef struct kib_connvars { diff --cc drivers/staging/mt29f_spinand/mt29f_spinand.c index b2e6237ae913,20a3f8eeb264..e893d5d8b862 --- a/drivers/staging/mt29f_spinand/mt29f_spinand.c +++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c @@@ -612,10 -612,10 +612,10 @@@ static int spinand_erase_block(struct s #ifdef CONFIG_MTD_SPINAND_ONDIEECC static int spinand_write_page_hwecc(struct mtd_info *mtd, - struct nand_chip *chip, const uint8_t *buf, int oob_required, - int page) + struct nand_chip *chip, - const u8 *buf, int oob_required) ++ const u8 *buf, int oob_required, int page) { - const uint8_t *p = buf; + const u8 *p = buf; int eccsize = chip->ecc.size; int eccsteps = chip->ecc.steps;