lkml.org 
[lkml]   [2018]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 56/78] media: davinci: fix a debug printk
    Date
    From: Mauro Carvalho Chehab <mchehab@s-opensource.com>

    [ Upstream commit 4f6c11044f512356cb63d3df0f3b38db79dc6736 ]

    Two orthogonal changesets caused a breakage at a printk
    inside davinci. Commit a2d17962c9ca
    ("[media] davinci: Switch from V4L2 OF to V4L2 fwnode")
    made davinci to use struct fwnode_handle instead of
    struct device_node. Commit 68d9c47b1679
    ("media: Convert to using %pOF instead of full_name")
    changed the printk to not use ->full_name, but, instead,
    to rely on %pOF.

    With both patches applied, the Kernel will do the wrong
    thing, as warned by smatch:
    drivers/media/platform/davinci/vpif_capture.c:1399 vpif_async_bound() error: '%pOF' expects argument of type 'struct device_node*', argument 5 has type 'void*'

    So, change the logic to actually print the device name
    that was obtained before the print logic.

    Fixes: 68d9c47b1679 ("media: Convert to using %pOF instead of full_name")
    Fixes: a2d17962c9ca ("[media] davinci: Switch from V4L2 OF to V4L2 fwnode")

    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/media/platform/davinci/vpif_capture.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
    index fca4dc829f73..4efabfcd34b1 100644
    --- a/drivers/media/platform/davinci/vpif_capture.c
    +++ b/drivers/media/platform/davinci/vpif_capture.c
    @@ -1397,9 +1397,9 @@ static int vpif_async_bound(struct v4l2_async_notifier *notifier,
    vpif_obj.config->chan_config->inputs[i].subdev_name =
    (char *)to_of_node(subdev->fwnode)->full_name;
    vpif_dbg(2, debug,
    - "%s: setting input %d subdev_name = %pOF\n",
    + "%s: setting input %d subdev_name = %s\n",
    __func__, i,
    - to_of_node(subdev->fwnode));
    + vpif_obj.config->chan_config->inputs[i].subdev_name);
    return 0;
    }
    }
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-08 08:00    [W:3.947 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site