lkml.org 
[lkml]   [2020]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 018/108] ntb_tool: Fix printk format
    Date
    From: Helge Deller <deller@gmx.de>

    [ Upstream commit 2ef97a6c181eba48f14c9ed98ce4398d21164683 ]

    The correct printk format is %pa or %pap, but not %pa[p].

    Fixes: 7f46c8b3a5523 ("NTB: ntb_tool: Add full multi-port NTB API support")
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Jon Mason <jdmason@kudzu.us>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ntb/test/ntb_tool.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
    index d592c0ffbd198..69da758fe64c8 100644
    --- a/drivers/ntb/test/ntb_tool.c
    +++ b/drivers/ntb/test/ntb_tool.c
    @@ -678,19 +678,19 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf,
    &inmw->dma_base);

    off += scnprintf(buf + off, buf_size - off,
    - "Window Size \t%pa[p]\n",
    + "Window Size \t%pap\n",
    &inmw->size);

    off += scnprintf(buf + off, buf_size - off,
    - "Alignment \t%pa[p]\n",
    + "Alignment \t%pap\n",
    &addr_align);

    off += scnprintf(buf + off, buf_size - off,
    - "Size Alignment \t%pa[p]\n",
    + "Size Alignment \t%pap\n",
    &size_align);

    off += scnprintf(buf + off, buf_size - off,
    - "Size Max \t%pa[p]\n",
    + "Size Max \t%pap\n",
    &size_max);

    ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
    @@ -907,16 +907,16 @@ static ssize_t tool_peer_mw_trans_read(struct file *filep, char __user *ubuf,
    "Virtual address \t0x%pK\n", outmw->io_base);

    off += scnprintf(buf + off, buf_size - off,
    - "Phys Address \t%pa[p]\n", &map_base);
    + "Phys Address \t%pap\n", &map_base);

    off += scnprintf(buf + off, buf_size - off,
    - "Mapping Size \t%pa[p]\n", &map_size);
    + "Mapping Size \t%pap\n", &map_size);

    off += scnprintf(buf + off, buf_size - off,
    "Translation Address \t0x%016llx\n", outmw->tr_base);

    off += scnprintf(buf + off, buf_size - off,
    - "Window Size \t%pa[p]\n", &outmw->size);
    + "Window Size \t%pap\n", &outmw->size);

    ret = simple_read_from_buffer(ubuf, size, offp, buf, off);
    kfree(buf);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-12 01:33    [W:3.326 / U:1.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site