Re: linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Arnd Bergmann]

On Wed, Sep 4, 2019 at 12:44 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> diff --cc drivers/dma/iop-adma.c
> index 03f4a588cf7f,003b753e4604..000000000000
> --- a/drivers/dma/iop-adma.c
> +++ b/drivers/dma/iop-adma.c
> @@@ -116,9 -116,9 +116,9 @@@ static void __iop_adma_slot_cleanup(str
>         list_for_each_entry_safe(iter, _iter, &iop_chan->chain,
>                                         chain_node) {
>                 pr_debug("\tcookie: %d slot: %d busy: %d "
> -                       "this_desc: %#x next_desc: %#llx ack: %d\n",
>  -                      "this_desc: %pad next_desc: %#x ack: %d\n",
> ++                      "this_desc: %pad next_desc: %#llx ack: %d\n",
>                         iter->async_tx.cookie, iter->idx, busy,
> -                       iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
>  -                      &iter->async_tx.phys, iop_desc_get_next_desc(iter),
> ++                      &iter->async_tx.phys, (u64)iop_desc_get_next_desc(iter),
>                         async_tx_test_ack(&iter->async_tx));
>                 prefetch(_iter);
>                 prefetch(&_iter->async_tx);

The resolution looks correct to me. I had to research how I missed this,
and it turns out that the problem is me testing with clang-9 rather than gcc
at the moment. While clang is perfectly capable of warning about this
issue, the kernel turns off -Wno-format when building with clang.

       Arnd