Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec71f128 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-fixes-2016-01-28' of... 

Merge tag 'drm-amdkfd-fixes-2016-01-28' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

two static checker fixes.

* tag 'drm-amdkfd-fixes-2016-01-28' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Remove unnecessary cast in kfree
  drm/amdgpu: fix non-ANSI declaration of amdgpu_amdkfd_gfx_*_get_functions()
parents 07c8fedd 642f0f2a

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.get_fw_version = get_fw_version

};



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions()

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void)

{

	return (struct kfd2kgd_calls *)&kfd2kgd;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.get_fw_version = get_fw_version

};



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions()

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void)

{

	return (struct kfd2kgd_calls *)&kfd2kgd;

}

drivers/gpu/drm/amd/amdkfd/kfd_process.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void kfd_process_wq_release(struct work_struct *work) 


	kfree(p);



	kfree((void *)work);

	kfree(work);

}



static void kfd_process_destroy_delayed(struct rcu_head *rcu)