From: Mark Brown <broonie@linaro.org>
Date: Mon, 7 Oct 2013 11:02:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
X-Git-Tag: v3.13-rc1~123^2~9^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dabefd56c6ee883bae0bdce4d5396c3f21286ab8;p=linux.git

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

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

dabefd56c6ee883bae0bdce4d5396c3f21286ab8
diff --cc drivers/spi/spi-ti-qspi.c
index a61aeb9bb823,4e2109d9853d..0b71270fbf67
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@@ -515,23 -543,12 +515,22 @@@ free_master
  	return ret;
  }
  
 +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);
- 	spi_unregister_master(qspi->master);
 +
 +	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,