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

Commit 557667f6 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 673d6e17 2fe7e4ad

Documentation/driver-model/devres.txt

+3 −0
Original line number Diff line number Diff line
@@ -302,3 +302,6 @@ PHY 


SLAVE DMA ENGINE

  devm_acpi_dma_controller_register()



SPI

  devm_spi_register_master()

drivers/spi/spi-bcm2835.c

+1 −3
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 
	bcm2835_wr(bs, BCM2835_SPI_CS,

		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);



	err = spi_register_master(master);

	err = devm_spi_register_master(&pdev->dev, master);

	if (err) {

		dev_err(&pdev->dev, "could not register SPI master: %d\n", err);

		goto out_free_irq;
@@ -381,14 +381,12 @@ static int bcm2835_spi_remove(struct platform_device *pdev) 
	struct bcm2835_spi *bs = spi_master_get_devdata(master);



	free_irq(bs->irq, master);

	spi_unregister_master(master);



	/* Clear FIFOs, and disable the HW block */

	bcm2835_wr(bs, BCM2835_SPI_CS,

		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);



	clk_disable_unprepare(bs->clk);

	spi_master_put(master);



	return 0;

}

drivers/spi/spi-bcm63xx.c

+1 −5
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 
	bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);



	/* register and we are done */

	ret = spi_register_master(master);

	ret = devm_spi_register_master(dev, master);

	if (ret) {

		dev_err(dev, "spi register failed\n");

		goto out_clk_disable;
@@ -438,8 +438,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) 
	struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));

	struct bcm63xx_spi *bs = spi_master_get_devdata(master);



	spi_unregister_master(master);



	/* reset spi block */

	bcm_spi_writeb(bs, 0, SPI_INT_MASK);
@@ -447,8 +445,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) 
	clk_disable_unprepare(bs->clk);

	clk_put(bs->clk);



	spi_master_put(master);



	return 0;

}

drivers/spi/spi-bfin-v3.c

+1 −2
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static int bfin_spi_probe(struct platform_device *pdev) 
	tasklet_init(&drv_data->pump_transfers,

			bfin_spi_pump_transfers, (unsigned long)drv_data);

	/* register with the SPI framework */

	ret = spi_register_master(master);

	ret = devm_spi_register_master(dev, master);

	if (ret) {

		dev_err(dev, "can not  register spi master\n");

		goto err_free_peripheral;
@@ -898,7 +898,6 @@ static int bfin_spi_remove(struct platform_device *pdev) 
	free_dma(drv_data->rx_dma);

	free_dma(drv_data->tx_dma);



	spi_unregister_master(drv_data->master);

	return 0;

}

drivers/spi/spi-clps711x.c

+1 −5
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
		goto clk_out;

	}



	ret = spi_register_master(master);

	ret = devm_spi_register_master(&pdev->dev, master);

	if (!ret) {

		dev_info(&pdev->dev,

			 "SPI bus driver initialized. Master clock %u Hz\n",
@@ -247,7 +247,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
			gpio_free(hw->chipselect[i]);



	spi_master_put(master);

	kfree(master);



	return ret;

}
@@ -262,9 +261,6 @@ static int spi_clps711x_remove(struct platform_device *pdev) 
		if (gpio_is_valid(hw->chipselect[i]))

			gpio_free(hw->chipselect[i]);



	spi_unregister_master(master);

	kfree(master);



	return 0;

}