summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-03-29 19:02:34 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-04-08 12:42:41 -0400
commite8bac374c0ed24f05bf389e1e8b5aca47f61bd3a (patch)
tree36b6e111f8706c0560ee552bc9d6e15b87fc9621 /drivers/gpu/nvgpu/gk20a/mc_gk20a.c
parent2382a8433fddaee3baecff6ae941944850787ab7 (diff)
gpu: nvgpu: Use device instead of platform_device
Use struct device instead of struct platform_device wherever possible. This allows adding other bus types later. Change-Id: I1657287a68d85a542cdbdd8a00d1902c3d6e00ed Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1120466
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mc_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mc_gk20a.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
index 0a773d10..ea8b8024 100644
--- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GK20A memory interface 2 * GK20A Master Control
3 * 3 *
4 * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -24,7 +24,7 @@ irqreturn_t mc_gk20a_isr_stall(struct gk20a *g)
24{ 24{
25 u32 mc_intr_0; 25 u32 mc_intr_0;
26 26
27 trace_mc_gk20a_intr_stall(g->dev->name); 27 trace_mc_gk20a_intr_stall(dev_name(g->dev));
28 28
29 if (!g->power_on) 29 if (!g->power_on)
30 return IRQ_NONE; 30 return IRQ_NONE;
@@ -42,7 +42,7 @@ irqreturn_t mc_gk20a_isr_stall(struct gk20a *g)
42 42
43 atomic_inc(&g->hw_irq_stall_count); 43 atomic_inc(&g->hw_irq_stall_count);
44 44
45 trace_mc_gk20a_intr_stall_done(g->dev->name); 45 trace_mc_gk20a_intr_stall_done(dev_name(g->dev));
46 46
47 return IRQ_WAKE_THREAD; 47 return IRQ_WAKE_THREAD;
48} 48}
@@ -77,7 +77,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g)
77 77
78 gk20a_dbg(gpu_dbg_intr, "interrupt thread launched"); 78 gk20a_dbg(gpu_dbg_intr, "interrupt thread launched");
79 79
80 trace_mc_gk20a_intr_thread_stall(g->dev->name); 80 trace_mc_gk20a_intr_thread_stall(dev_name(g->dev));
81 81
82 mc_intr_0 = gk20a_readl(g, mc_intr_0_r()); 82 mc_intr_0 = gk20a_readl(g, mc_intr_0_r());
83 hw_irq_count = atomic_read(&g->hw_irq_stall_count); 83 hw_irq_count = atomic_read(&g->hw_irq_stall_count);
@@ -111,7 +111,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g)
111 111
112 wake_up_all(&g->sw_irq_stall_last_handled_wq); 112 wake_up_all(&g->sw_irq_stall_last_handled_wq);
113 113
114 trace_mc_gk20a_intr_thread_stall_done(g->dev->name); 114 trace_mc_gk20a_intr_thread_stall_done(dev_name(g->dev));
115 115
116 return IRQ_HANDLED; 116 return IRQ_HANDLED;
117} 117}