Re: [PATCH] drm/i915: use __func__ instead of __FUNCTION__

On Fri, 28 Mar 2014, Christoph Jaeger christophjaeger@linux.com wrote:

__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.

Signed-off-by: Christoph Jaeger christophjaeger@linux.com

drivers/gpu/drm/i915/dvo_ns2501.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c index 954acb2..e40cd26 100644 --- a/drivers/gpu/drm/i915/dvo_ns2501.c +++ b/drivers/gpu/drm/i915/dvo_ns2501.c @@ -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;

-- 1.8.5.3