restore strscpy() paths to reduce diff to linux

diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 68fb4b9..708775a 100644 (file)
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5312,15 +5312,9 @@ static void fill_audio_info(struct audio_info *audio_info,
 
        cea_revision = drm_connector->display_info.cea_rev;
 
-#ifdef __linux__
        strscpy(audio_info->display_name,
                edid_caps->display_name,
                AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS);
-#else
-       strncpy(audio_info->display_name,
-               edid_caps->display_name,
-               AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS - 1);
-#endif
 
        if (cea_revision >= 3) {
                audio_info->mode_count = edid_caps->audio_mode_count;
@@ -6675,11 +6669,7 @@ amdgpu_dm_create_common_mode(struct drm_encoder *encoder,
        mode->hdisplay = hdisplay;
        mode->vdisplay = vdisplay;
        mode->type &= ~DRM_MODE_TYPE_PREFERRED;
-#ifdef __linux__
        strscpy(mode->name, name, DRM_DISPLAY_MODE_LEN);
-#else
-       strncpy(mode->name, name, DRM_DISPLAY_MODE_LEN);
-#endif
 
        return mode;
 

diff --git a/sys/dev/pci/drm/drm_client.c b/sys/dev/pci/drm/drm_client.c
index 3d32a9a..2b230b4 100644 (file)
--- a/sys/dev/pci/drm/drm_client.c
+++ b/sys/dev/pci/drm/drm_client.c
@@ -391,11 +391,7 @@ static int drm_client_buffer_addfb(struct drm_client_buffer *buffer,
        /* drop the reference we picked up in framebuffer lookup */
        drm_framebuffer_put(buffer->fb);
 
-#ifdef __linux__
        strscpy(buffer->fb->comm, client->name, TASK_COMM_LEN);
-#else
-       strlcpy(buffer->fb->comm, client->name, TASK_COMM_LEN);
-#endif
 
        return 0;
 }