From: Tom Rini Date: Wed, 30 May 2018 18:51:37 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-spi X-Git-Tag: v2018.07-rc1~27 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ada17dde84954e36d8bc6ff62a6956686eb0ec4;p=u-boot Merge branch 'master' of git://git.denx.de/u-boot-spi - Fix a conflict in drivers/spi/atcspi200_spi.c related to the riscv tree fixing a warning. Signed-off-by: Tom Rini --- 8ada17dde84954e36d8bc6ff62a6956686eb0ec4 diff --cc drivers/spi/atcspi200_spi.c index be424e0a6f,6233d4978f..af96c6d21e --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@@ -229,8 -229,10 +229,10 @@@ static int __atcspi200_spi_xfer(struct __atcspi200_spi_start(ns); break; } - debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n", - *(uint *)data_out, data_out, *(uint *)data_in, data_in, data_len); + if (data_out) - debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %u\n", ++ debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n", + *(uint *)data_out, data_out, *(uint *)data_in, + data_in, data_len); num_chunks = DIV_ROUND_UP(data_len, max_tran_len); din = data_in; dout = data_out;