Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / drivers / spi / spi-qup.c

diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 1364516e87c29b0e4255b61bfdde045a7761f6bc..974a8ce58b68bc31e38d717ff16564aec398232e 100644 (file)
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -427,8 +427,6 @@ static u32 spi_qup_sgl_get_nents_len(struct scatterlist *sgl, u32 max,
        struct scatterlist *sg;
        u32 total = 0;
 
-       *nents = 0;
-
        for (sg = sgl; sg; sg = sg_next(sg)) {
                unsigned int len = sg_dma_len(sg);
 
@@ -461,7 +459,7 @@ static int spi_qup_do_dma(struct spi_device *spi, struct spi_transfer *xfer,
        tx_sgl = xfer->tx_sg.sgl;
 
        do {
-               u32 rx_nents, tx_nents;
+               u32 rx_nents = 0, tx_nents = 0;
 
                if (rx_sgl)
                        qup->n_words = spi_qup_sgl_get_nents_len(rx_sgl,
@@ -1059,7 +1057,7 @@ static int spi_qup_probe(struct platform_device *pdev)
        else if (!ret)
                master->can_dma = spi_qup_can_dma;
 
-       controller->qup_v1 = (int)of_device_get_match_data(dev);
+       controller->qup_v1 = (uintptr_t)of_device_get_match_data(dev);
 
        if (!controller->qup_v1)
                master->set_cs = spi_qup_set_cs;