Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / drivers / spi / spi-pic32-sqi.c

diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c
index bd1c6b53283f60c019e77f217ce7510c24a8e0ce..d7e4e18ec3df1b2414a0096d6d38fed296077ebd 100644 (file)
--- a/drivers/spi/spi-pic32-sqi.c
+++ b/drivers/spi/spi-pic32-sqi.c
@@ -468,7 +468,7 @@ static int ring_desc_ring_alloc(struct pic32_sqi *sqi)
        /* allocate coherent DMAable memory for hardware buffer descriptors. */
        sqi->bd = dma_zalloc_coherent(&sqi->master->dev,
                                      sizeof(*bd) * PESQI_BD_COUNT,
-                                     &sqi->bd_dma, GFP_DMA32);
+                                     &sqi->bd_dma, GFP_KERNEL);
        if (!sqi->bd) {
                dev_err(&sqi->master->dev, "failed allocating dma buffer\n");
                return -ENOMEM;
@@ -656,7 +656,7 @@ static int pic32_sqi_probe(struct platform_device *pdev)
        master->max_speed_hz    = clk_get_rate(sqi->base_clk);
        master->dma_alignment   = 32;
        master->max_dma_len     = PESQI_BD_BUF_LEN_MAX;
-       master->dev.of_node     = of_node_get(pdev->dev.of_node);
+       master->dev.of_node     = pdev->dev.of_node;
        master->mode_bits       = SPI_MODE_3 | SPI_MODE_0 | SPI_TX_DUAL |
                                  SPI_RX_DUAL | SPI_TX_QUAD | SPI_RX_QUAD;
        master->flags           = SPI_MASTER_HALF_DUPLEX;