Merge remote-tracking branch 'spi/topic/devm' into spi-qspi

Conflicts:
	drivers/spi/spi-ti-qspi.c

diff --cc drivers/spi/spi-ti-qspi.c
index a61aeb9bb8237b07541cee231660d90ca9aaa72b,4e2109d9853df46460d0a7d31a470385bf975c89..0b71270fbf67ba671dd43f116db48de30076514c
--- 1/drivers/spi/spi-ti-qspi.c
--- 2/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@@ -515,23 -543,12 +515,22 @@@ free_master
        return ret;
  }
  
-       spi_unregister_master(qspi->master);
 +static int ti_qspi_remove(struct platform_device *pdev)
 +{
 +      struct  ti_qspi *qspi = platform_get_drvdata(pdev);
 +
 +      ti_qspi_write(qspi, QSPI_WC_INT_DISABLE, QSPI_INTR_ENABLE_CLEAR_REG);
 +
 +      return 0;
 +}
 +
  static const struct dev_pm_ops ti_qspi_pm_ops = {
        .runtime_resume = ti_qspi_runtime_resume,
  };
  
  static struct platform_driver ti_qspi_driver = {
        .probe  = ti_qspi_probe,
-       .remove = ti_qspi_remove,
++      .remove = ti_qspi_remove,
        .driver = {
                .name   = "ti,dra7xxx-qspi",
                .owner  = THIS_MODULE,