From 22426a5452ba943ac48867722fb0927baf66d4ac Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 10 Apr 2017 10:47:02 -0700 Subject: gpu: nvgpu: gk20a: Use new delay APIs Use platform agnostic delay functions instead of Linux kernel APIs. This allows removing dependency to Linux header linux/delay.h. At the same time remove #include lines for other unused Linux headers. JIRA NVGPU-16 Change-Id: I46b9ccb80e0b67efb86ec85676e5a55ff835c0ec Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1460113 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman --- drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c index 08198776..07cdc9e5 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c @@ -16,11 +16,10 @@ * along with this program. If not, see . */ -#include /* for mdelay */ - #include "gk20a.h" #include +#include #include #include @@ -62,7 +61,7 @@ static void gk20a_reset_priv_ring(struct gk20a *g) gk20a_writel(g, pri_ringmaster_global_ctl_r(), pri_ringmaster_global_ctl_ring_reset_asserted_f()); - udelay(20); + nvgpu_udelay(20); gk20a_writel(g, pri_ringmaster_global_ctl_r(), pri_ringmaster_global_ctl_ring_reset_deasserted_f()); @@ -119,7 +118,7 @@ void gk20a_priv_ring_isr(struct gk20a *g) do { cmd = pri_ringmaster_command_cmd_v( gk20a_readl(g, pri_ringmaster_command_r())); - usleep_range(20, 40); + nvgpu_usleep_range(20, 40); } while (cmd != pri_ringmaster_command_cmd_no_cmd_v() && --retry); if (retry <= 0) -- cgit v1.2.2