[v2] drm: Convert to using %pOFn instead of device_node.name

Message ID 20180928225044.20132-1-robh@kernel.org
State New
Headers show
Series
  • [v2] drm: Convert to using %pOFn instead of device_node.name
Related show

Commit Message

Rob Herring Sept. 28, 2018, 10:50 p.m.
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

For drm_modes.c, the full node path is already printed out, so printing
just the node name a 2nd time is redundant and can be removed.

Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Acked-by: Rob Clark <robdclark@gmail.com>

Cc: dri-devel@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Signed-off-by: Rob Herring <robh@kernel.org>

---
v2:
- Add to commit msg that we're dropping redundant printing of node name.

 drivers/gpu/drm/drm_modes.c     | 4 ++--
 drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.17.1

Comments

Daniel Vetter Oct. 1, 2018, 8:16 a.m. | #1
On Fri, Sep 28, 2018 at 05:50:44PM -0500, Rob Herring wrote:
> In preparation to remove the node name pointer from struct device_node,

> convert printf users to use the %pOFn format specifier.

> 

> For drm_modes.c, the full node path is already printed out, so printing

> just the node name a 2nd time is redundant and can be removed.

> 

> Cc: Gustavo Padovan <gustavo@padovan.org>

> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

> Cc: Sean Paul <sean@poorly.run>

> Cc: David Airlie <airlied@linux.ie>

> Acked-by: Rob Clark <robdclark@gmail.com>

> Cc: dri-devel@lists.freedesktop.org

> Cc: linux-arm-msm@vger.kernel.org

> Cc: freedreno@lists.freedesktop.org

> Signed-off-by: Rob Herring <robh@kernel.org>

> ---

> v2:

> - Add to commit msg that we're dropping redundant printing of node name.


Applied, thanks for the patch.

Aside, still don't want drm-misc commit rights so you can offload these
yourself?

Cheers, Daniel

> 

>  drivers/gpu/drm/drm_modes.c     | 4 ++--

>  drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +-

>  2 files changed, 3 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c

> index 02db9ac82d7a..24a750436559 100644

> --- a/drivers/gpu/drm/drm_modes.c

> +++ b/drivers/gpu/drm/drm_modes.c

> @@ -716,8 +716,8 @@ int of_get_drm_display_mode(struct device_node *np,

>  	if (bus_flags)

>  		drm_bus_flags_from_videomode(&vm, bus_flags);

>  

> -	pr_debug("%pOF: got %dx%d display mode from %s\n",

> -		np, vm.hactive, vm.vactive, np->name);

> +	pr_debug("%pOF: got %dx%d display mode\n",

> +		np, vm.hactive, vm.vactive);

>  	drm_mode_debug_printmodeline(dmode);

>  

>  	return 0;

> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c

> index c79659ca5706..23670907a29d 100644

> --- a/drivers/gpu/drm/msm/hdmi/hdmi.c

> +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c

> @@ -579,7 +579,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data)

>  	hdmi_cfg = (struct hdmi_platform_config *)

>  			of_device_get_match_data(dev);

>  	if (!hdmi_cfg) {

> -		dev_err(dev, "unknown hdmi_cfg: %s\n", of_node->name);

> +		dev_err(dev, "unknown hdmi_cfg: %pOFn\n", of_node);

>  		return -ENXIO;

>  	}

>  

> -- 

> 2.17.1

> 

> _______________________________________________

> dri-devel mailing list

> dri-devel@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/dri-devel


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Rob Herring Nov. 6, 2018, 9:57 p.m. | #2
On Mon, Oct 1, 2018 at 3:17 AM Daniel Vetter <daniel@ffwll.ch> wrote:
>

> On Fri, Sep 28, 2018 at 05:50:44PM -0500, Rob Herring wrote:

> > In preparation to remove the node name pointer from struct device_node,

> > convert printf users to use the %pOFn format specifier.

> >

> > For drm_modes.c, the full node path is already printed out, so printing

> > just the node name a 2nd time is redundant and can be removed.

> >

> > Cc: Gustavo Padovan <gustavo@padovan.org>

> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

> > Cc: Sean Paul <sean@poorly.run>

> > Cc: David Airlie <airlied@linux.ie>

> > Acked-by: Rob Clark <robdclark@gmail.com>

> > Cc: dri-devel@lists.freedesktop.org

> > Cc: linux-arm-msm@vger.kernel.org

> > Cc: freedreno@lists.freedesktop.org

> > Signed-off-by: Rob Herring <robh@kernel.org>

> > ---

> > v2:

> > - Add to commit msg that we're dropping redundant printing of node name.

>

> Applied, thanks for the patch.


It appears this hasn't been.

> Aside, still don't want drm-misc commit rights so you can offload these

> yourself?


No thanks.

Rob
Daniel Vetter Nov. 6, 2018, 10:26 p.m. | #3
On Tue, Nov 06, 2018 at 03:57:16PM -0600, Rob Herring wrote:
> On Mon, Oct 1, 2018 at 3:17 AM Daniel Vetter <daniel@ffwll.ch> wrote:

> >

> > On Fri, Sep 28, 2018 at 05:50:44PM -0500, Rob Herring wrote:

> > > In preparation to remove the node name pointer from struct device_node,

> > > convert printf users to use the %pOFn format specifier.

> > >

> > > For drm_modes.c, the full node path is already printed out, so printing

> > > just the node name a 2nd time is redundant and can be removed.

> > >

> > > Cc: Gustavo Padovan <gustavo@padovan.org>

> > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

> > > Cc: Sean Paul <sean@poorly.run>

> > > Cc: David Airlie <airlied@linux.ie>

> > > Acked-by: Rob Clark <robdclark@gmail.com>

> > > Cc: dri-devel@lists.freedesktop.org

> > > Cc: linux-arm-msm@vger.kernel.org

> > > Cc: freedreno@lists.freedesktop.org

> > > Signed-off-by: Rob Herring <robh@kernel.org>

> > > ---

> > > v2:

> > > - Add to commit msg that we're dropping redundant printing of node name.

> >

> > Applied, thanks for the patch.

> 

> It appears this hasn't been.


It is, just not yet in linux-next. I'll kick the drm-misc maintainers to
roll the trees forward.
-Daniel

> 

> > Aside, still don't want drm-misc commit rights so you can offload these

> > yourself?

> 

> No thanks.

> 

> Rob

> _______________________________________________

> dri-devel mailing list

> dri-devel@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/dri-devel


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Patch

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 02db9ac82d7a..24a750436559 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -716,8 +716,8 @@  int of_get_drm_display_mode(struct device_node *np,
 	if (bus_flags)
 		drm_bus_flags_from_videomode(&vm, bus_flags);
 
-	pr_debug("%pOF: got %dx%d display mode from %s\n",
-		np, vm.hactive, vm.vactive, np->name);
+	pr_debug("%pOF: got %dx%d display mode\n",
+		np, vm.hactive, vm.vactive);
 	drm_mode_debug_printmodeline(dmode);
 
 	return 0;
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index c79659ca5706..23670907a29d 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -579,7 +579,7 @@  static int msm_hdmi_bind(struct device *dev, struct device *master, void *data)
 	hdmi_cfg = (struct hdmi_platform_config *)
 			of_device_get_match_data(dev);
 	if (!hdmi_cfg) {
-		dev_err(dev, "unknown hdmi_cfg: %s\n", of_node->name);
+		dev_err(dev, "unknown hdmi_cfg: %pOFn\n", of_node);
 		return -ENXIO;
 	}