drm/i915: use __func__ instead of __FUNCTION__
Subsystems (2)
PATCH 1/1 drm/i915: use __func__ instead of __FUNCTION__
__FUNCTION__ is gcc specific; use __func__ instead.
--- drivers/gpu/drm/i915/dvo_ns2501.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/dvo_ns2501.c +6 -9
@@ -234,7 +234,7 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, {DRM_DEBUG_KMS ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/*
@@ -262,7 +262,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,DRM_DEBUG_KMS ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/*
@@ -277,8 +277,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,if (mode->hdisplay ==800 && mode->vdisplay ==600 ) {/* mode 277 */ ns->reg_8_shadow &= ~NS2501_8_BPAS ; -DRM_DEBUG_KMS ("%s: switching to 800x600\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("%s: switching to 800x600\n" , __func__);/* * No, I do not know where this data comes from.
@@ -341,8 +340,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==640 && mode->vdisplay ==480 ) {/* mode 274 */ -DRM_DEBUG_KMS ("%s: switching to 640x480\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("%s: switching to 640x480\n" , __func__);/* * No, I do not know where this data comes from. * It is just what the video bios left in the DVO, so
@@ -406,8 +404,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==1024 && mode->vdisplay ==768 ) {/* mode 280 */ -DRM_DEBUG_KMS ("%s: switching to 1024x768\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("%s: switching to 1024x768\n" , __func__);/* * This might or might not work, actually. I'm silently * assuming here that the native panel resolution is
@@ -459,7 +456,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable)unsigned char ch;DRM_DEBUG_KMS ("%s: Trying set the dpms of the DVO to %i\n" , - __FUNCTION__, enable); + __func__, enable); ch = ns->reg_8_shadow;
Signature · 1 line
1.8.5.3
Jani Nikula
maintainerQuoted 1 line · Christoph Jaeger
__FUNCTION__is gcc specific; use__func__instead.
I acknowledge the patch is correct and functionally the same as before. However the correct fix would be to drop __FUNCTION__ and the corresponding "%s: " altogether as DRM_DEBUG_KMS includes printing the function name.
BR,
Jani.
Quoted 70 lines
Signed-off-by Christoph Jaeger <[email protected]>--- drivers/gpu/drm/i915/dvo_ns2501.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/dvo_ns2501.c +6
-9@@ -234,7 +234,7 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, {DRM_DEBUG_KMS ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* @@ -262,7 +262,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,DRM_DEBUG_KMS ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* @@ -277,8 +277,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,if (mode->hdisplay ==800 && mode->vdisplay ==600 ) {/* mode 277 */ ns->reg_8_shadow &= ~NS2501_8_BPAS ; -DRM_DEBUG_KMS ("%s: switching to 800x600\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("%s: switching to 800x600\n" , __func__);/* * No, I do not know where this data comes from. @@ -341,8 +340,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==640 && mode->vdisplay ==480 ) {/* mode 274 */ -DRM_DEBUG_KMS ("%s: switching to 640x480\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("%s: switching to 640x480\n" , __func__);/* * No, I do not know where this data comes from. * It is just what the video bios left in the DVO, so @@ -406,8 +404,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==1024 && mode->vdisplay ==768 ) {/* mode 280 */ -DRM_DEBUG_KMS ("%s: switching to 1024x768\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("%s: switching to 1024x768\n" , __func__);/* * This might or might not work, actually. I'm silently * assuming here that the native panel resolution is @@ -459,7 +456,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable)unsigned char ch;DRM_DEBUG_KMS ("%s: Trying set the dpms of the DVO to %i\n" , - __FUNCTION__, enable); + __func__, enable); ch = ns->reg_8_shadow;Signature · 1 line
1.8.5.3
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Thanks for review.
This patch obsoletes patch "drm/i915: use __func__ instead of __FUNCTION__".
Best,
Chris
PATCH 1/1 drm/i915: drop __FUNCTION__ as argument to DRM_DEBUG_KMS
DRM_DEBUG_KMS includes printing the function name.
--- drivers/gpu/drm/i915/dvo_ns2501.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/dvo_ns2501.c +8 -14
@@ -233,9 +233,8 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, struct drm_display_mode *mode) {DRM_DEBUG_KMS - ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, - mode->vtotal); + ("is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , + mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* * Currently, these are all the modes I have data from.
@@ -261,9 +260,8 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);DRM_DEBUG_KMS - ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, - mode->vtotal); + ("set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , + mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* * Where do I find the native resolution for which scaling is not required???
@@ -277,8 +275,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,if (mode->hdisplay ==800 && mode->vdisplay ==600 ) {/* mode 277 */ ns->reg_8_shadow &= ~NS2501_8_BPAS ; -DRM_DEBUG_KMS ("%s: switching to 800x600\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 800x600\n" );/* * No, I do not know where this data comes from.
@@ -341,8 +338,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==640 && mode->vdisplay ==480 ) {/* mode 274 */ -DRM_DEBUG_KMS ("%s: switching to 640x480\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 640x480\n" );/* * No, I do not know where this data comes from. * It is just what the video bios left in the DVO, so
@@ -406,8 +402,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==1024 && mode->vdisplay ==768 ) {/* mode 280 */ -DRM_DEBUG_KMS ("%s: switching to 1024x768\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 1024x768\n" );/* * This might or might not work, actually. I'm silently * assuming here that the native panel resolution is
@@ -458,8 +453,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable)struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);unsigned char ch; -DRM_DEBUG_KMS ("%s: Trying set the dpms of the DVO to %i\n" , - __FUNCTION__, enable); +DRM_DEBUG_KMS ("Trying set the dpms of the DVO to %i\n" , enable); ch = ns->reg_8_shadow;
Signature · 1 line
1.8.5.3
Re: [PATCH] drm/i915: drop __FUNCTION__ as argument to DRM_DEBUG_KMS
Quoted 3 lines · Christoph Jaeger
DRM_DEBUG_KMSincludes printing the function name.Signed-off-by Christoph Jaeger <[email protected]>
Quoted 75 lines
--- drivers/gpu/drm/i915/dvo_ns2501.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/dvo_ns2501.c +8
-14@@ -233,9 +233,8 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, struct drm_display_mode *mode) {DRM_DEBUG_KMS - ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, - mode->vtotal); + ("is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , + mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* * Currently, these are all the modes I have data from. @@ -261,9 +260,8 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);DRM_DEBUG_KMS - ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, - mode->vtotal); + ("set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , + mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* * Where do I find the native resolution for which scaling is not required??? @@ -277,8 +275,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,if (mode->hdisplay ==800 && mode->vdisplay ==600 ) {/* mode 277 */ ns->reg_8_shadow &= ~NS2501_8_BPAS ; -DRM_DEBUG_KMS ("%s: switching to 800x600\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 800x600\n" );/* * No, I do not know where this data comes from. @@ -341,8 +338,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==640 && mode->vdisplay ==480 ) {/* mode 274 */ -DRM_DEBUG_KMS ("%s: switching to 640x480\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 640x480\n" );/* * No, I do not know where this data comes from. * It is just what the video bios left in the DVO, so @@ -406,8 +402,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==1024 && mode->vdisplay ==768 ) {/* mode 280 */ -DRM_DEBUG_KMS ("%s: switching to 1024x768\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 1024x768\n" );/* * This might or might not work, actually. I'm silently * assuming here that the native panel resolution is @@ -458,8 +453,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable)struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);unsigned char ch; -DRM_DEBUG_KMS ("%s: Trying set the dpms of the DVO to %i\n" , - __FUNCTION__, enable); +DRM_DEBUG_KMS ("Trying set the dpms of the DVO to %i\n" , enable); ch = ns->reg_8_shadow;Signature · 1 line
1.8.5.3
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Daniel Vetter
AppliedRe: [PATCH] drm/i915: drop __FUNCTION__ as argument to DRM_DEBUG_KMS
Quoted 6 lines · Jani Nikula
Quoted 3 lines · Christoph Jaeger
DRM_DEBUG_KMSincludes printing the function name.Signed-off-by Christoph Jaeger <[email protected]>Reviewed-by Jani Nikula <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 80 lines
Quoted 77 lines
--- drivers/gpu/drm/i915/dvo_ns2501.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/dvo_ns2501.c +8
-14@@ -233,9 +233,8 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, struct drm_display_mode *mode) {DRM_DEBUG_KMS - ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, - mode->vtotal); + ("is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n" , + mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* * Currently, these are all the modes I have data from. @@ -261,9 +260,8 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);DRM_DEBUG_KMS - ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, - mode->vtotal); + ("set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n" , + mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);/* * Where do I find the native resolution for which scaling is not required??? @@ -277,8 +275,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,if (mode->hdisplay ==800 && mode->vdisplay ==600 ) {/* mode 277 */ ns->reg_8_shadow &= ~NS2501_8_BPAS ; -DRM_DEBUG_KMS ("%s: switching to 800x600\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 800x600\n" );/* * No, I do not know where this data comes from. @@ -341,8 +338,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==640 && mode->vdisplay ==480 ) {/* mode 274 */ -DRM_DEBUG_KMS ("%s: switching to 640x480\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 640x480\n" );/* * No, I do not know where this data comes from. * It is just what the video bios left in the DVO, so @@ -406,8 +402,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, }else if (mode->hdisplay ==1024 && mode->vdisplay ==768 ) {/* mode 280 */ -DRM_DEBUG_KMS ("%s: switching to 1024x768\n" , - __FUNCTION__); +DRM_DEBUG_KMS ("switching to 1024x768\n" );/* * This might or might not work, actually. I'm silently * assuming here that the native panel resolution is @@ -458,8 +453,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable)struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);unsigned char ch; -DRM_DEBUG_KMS ("%s: Trying set the dpms of the DVO to %i\n" , - __FUNCTION__, enable); +DRM_DEBUG_KMS ("Trying set the dpms of the DVO to %i\n" , enable); ch = ns->reg_8_shadow;Signature · 1 line
1.8.5.3Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch