diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2014-06-30 16:17:48 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2014-06-30 16:17:48 +0200 |
| commit | 20707b0fb4cde6e011c20699d0d7a9a9f9df22c3 (patch) | |
| tree | 9852a74da41a1b6393343c3a1a1f500d5a33ad53 /drivers/spi | |
| parent | 407caec80cbdb122b42ddcd55fa337a21004c5c2 (diff) | |
| parent | 774e1e67ef51e643e0415baddcbd26f4d44e3270 (diff) | |
Merge tag 'v3.14.3' into v3.14-rt
This is the 3.14.3 stable release
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-dw.c | 7 | ||||
| -rw-r--r-- | drivers/spi/spi-efm32.c | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index bf98d63d92b3..e63d27013142 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -671,12 +671,6 @@ static int dw_spi_setup(struct spi_device *spi) return 0; } -static void dw_spi_cleanup(struct spi_device *spi) -{ - struct chip_data *chip = spi_get_ctldata(spi); - kfree(chip); -} - static int init_queue(struct dw_spi *dws) { INIT_LIST_HEAD(&dws->queue); @@ -806,7 +800,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16); master->bus_num = dws->bus_num; master->num_chipselect = dws->num_cs; - master->cleanup = dw_spi_cleanup; master->setup = dw_spi_setup; master->transfer = dw_spi_transfer; diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c index d4d3cc534792..8933eb7ab79b 100644 --- a/drivers/spi/spi-efm32.c +++ b/drivers/spi/spi-efm32.c @@ -487,6 +487,9 @@ static int efm32_spi_remove(struct platform_device *pdev) static const struct of_device_id efm32_spi_dt_ids[] = { { + .compatible = "energymicro,efm32-spi", + }, { + /* doesn't follow the "vendor,device" scheme, don't use */ .compatible = "efm32,spi", }, { /* sentinel */ |