Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeac8103 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A smattering of driver specific fixes here, including a bunch for a
  long standing common pattern in the error handling paths, and a fix
  for an embarrassing thinko in the new devm master registration code"

* tag 'spi-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi/pxa2xx: Restore private register bits.
  spi/qspi: Fix qspi remove path.
  spi/qspi: cleanup pm_runtime error check.
  spi/qspi: set correct platform drvdata in ti_qspi_probe()
  spi/pxa2xx: add new ACPI IDs
  spi: core: invert success test in devm_spi_register_master
  spi: spi-mxs: fix reference leak to master in mxs_spi_remove()
  spi: bcm63xx: fix reference leak to master in bcm63xx_spi_remove()
  spi: txx9: fix reference leak to master in txx9spi_remove()
  spi: mpc512x: fix reference leak to master in mpc512x_psc_spi_do_remove()
  spi: rspi: use platform drvdata correctly in rspi_remove()
  spi: bcm2835: fix reference leak to master in bcm2835_spi_remove()
parents 5fc92de3 c18158f1

drivers/spi/spi-bcm2835.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 


static int bcm2835_spi_remove(struct platform_device *pdev)

{

	struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));

	struct spi_master *master = platform_get_drvdata(pdev);

	struct bcm2835_spi *bs = spi_master_get_devdata(master);



	free_irq(bs->irq, master);

drivers/spi/spi-bcm63xx.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 


static int bcm63xx_spi_remove(struct platform_device *pdev)

{

	struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));

	struct spi_master *master = platform_get_drvdata(pdev);

	struct bcm63xx_spi *bs = spi_master_get_devdata(master);



	/* reset spi block */

drivers/spi/spi-mpc512x-psc.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, 


static int mpc512x_psc_spi_do_remove(struct device *dev)

{

	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));

	struct spi_master *master = dev_get_drvdata(dev);

	struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);



	clk_disable_unprepare(mps->clk_mclk);

drivers/spi/spi-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int mxs_spi_remove(struct platform_device *pdev) 
	struct mxs_spi *spi;

	struct mxs_ssp *ssp;



	master = spi_master_get(platform_get_drvdata(pdev));

	master = platform_get_drvdata(pdev);

	spi = spi_master_get_devdata(master);

	ssp = &spi->ssp;

drivers/spi/spi-pxa2xx.c

+5 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) 
static struct acpi_device_id pxa2xx_spi_acpi_match[] = {

	{ "INT33C0", 0 },

	{ "INT33C1", 0 },

	{ "INT3430", 0 },

	{ "INT3431", 0 },

	{ "80860F0E", 0 },

	{ },

};
@@ -1291,6 +1293,9 @@ static int pxa2xx_spi_resume(struct device *dev) 
	/* Enable the SSP clock */

	clk_prepare_enable(ssp->clk);



	/* Restore LPSS private register bits */

	lpss_ssp_setup(drv_data);



	/* Start the queue running */

	status = spi_master_resume(drv_data->master);

	if (status != 0) {