[Intel-gfx] [PATCH 2/7] drm/nouveau: replace drm_get_connector_name() with direct name field use

[Jani Nikula]

On Mon, 26 May 2014, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> On Mon, May 26, 2014 at 9:35 AM, Jani Nikula <jani.nikula at intel.com> wrote:
>> Generated using semantic patch:
>>
>> @@
>> expression E;
>> @@
>>
>> - drm_get_connector_name(E)
>> + E->name
>>
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> ---
>>  drivers/gpu/drm/nouveau/dispnv04/dac.c      | 2 +-
>>  drivers/gpu/drm/nouveau/dispnv04/dfp.c      | 2 +-
>>  drivers/gpu/drm/nouveau/dispnv04/disp.c     | 2 +-
>>  drivers/gpu/drm/nouveau/dispnv04/tvnv04.c   | 3 ++-
>>  drivers/gpu/drm/nouveau/dispnv04/tvnv17.c   | 3 +--
>>  drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
>>  drivers/gpu/drm/nouveau/nv50_display.c      | 2 +-
>>  7 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
>> index 434b920f6bd4..d4d95df2b3c6 100644
>> --- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
>> +++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
>> @@ -414,7 +414,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder)
>>         helper->dpms(encoder, DRM_MODE_DPMS_ON);
>>
>>         NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
>> -                drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
>> +                (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
>
> That looks pretty vile... how about
>
> nouveau_encoder_connector_get(nv_encoder)->base.name

Ugh, agreed. Let me see if I can tweak the semantic patch, or if I need
to do it manually.

Thanks,
Jani.


-- 
Jani Nikula, Intel Open Source Technology Center