Merge remote-tracking branch 'spi/topic/tegra-slink' into spi-next

[karo-tx-linux.git] / drivers / spi / spi-tegra20-slink.c

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 14292c53c0309ee7d6fe973b77afa84798a085d8..af0a67886ae8bee523c469af2d89d49aca9c2ec5 100644 (file)
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -283,7 +283,7 @@ static unsigned tegra_slink_calculate_curr_xfer_param(
        unsigned total_fifo_words;
 
        bits_per_word = t->bits_per_word;
-       tspi->bytes_per_word = (bits_per_word - 1) / 8 + 1;
+       tspi->bytes_per_word = DIV_ROUND_UP(bits_per_word, 8);
 
        if (bits_per_word == 8 || bits_per_word == 16) {
                tspi->is_packed = 1;
@@ -1159,7 +1159,7 @@ static int tegra_slink_probe(struct platform_device *pdev)
        pm_runtime_put(&pdev->dev);
 
        master->dev.of_node = pdev->dev.of_node;
-       ret = spi_register_master(master);
+       ret = devm_spi_register_master(&pdev->dev, master);
        if (ret < 0) {
                dev_err(&pdev->dev, "can not register to master err %d\n", ret);
                goto exit_pm_disable;
@@ -1186,7 +1186,6 @@ static int tegra_slink_remove(struct platform_device *pdev)
        struct tegra_slink_data *tspi = spi_master_get_devdata(master);
 
        free_irq(tspi->irq, tspi);
-       spi_unregister_master(master);
 
        if (tspi->tx_dma_chan)
                tegra_slink_deinit_dma_param(tspi, false);