From e8bac374c0ed24f05bf389e1e8b5aca47f61bd3a Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 29 Mar 2016 16:02:34 -0700 Subject: 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 Reviewed-on: http://git-master/r/1120466 --- drivers/gpu/nvgpu/gk20a/mc_gk20a.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mc_gk20a.c') 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 @@ /* - * GK20A memory interface + * GK20A Master Control * - * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -24,7 +24,7 @@ irqreturn_t mc_gk20a_isr_stall(struct gk20a *g) { u32 mc_intr_0; - trace_mc_gk20a_intr_stall(g->dev->name); + trace_mc_gk20a_intr_stall(dev_name(g->dev)); if (!g->power_on) return IRQ_NONE; @@ -42,7 +42,7 @@ irqreturn_t mc_gk20a_isr_stall(struct gk20a *g) atomic_inc(&g->hw_irq_stall_count); - trace_mc_gk20a_intr_stall_done(g->dev->name); + trace_mc_gk20a_intr_stall_done(dev_name(g->dev)); return IRQ_WAKE_THREAD; } @@ -77,7 +77,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g) gk20a_dbg(gpu_dbg_intr, "interrupt thread launched"); - trace_mc_gk20a_intr_thread_stall(g->dev->name); + trace_mc_gk20a_intr_thread_stall(dev_name(g->dev)); mc_intr_0 = gk20a_readl(g, mc_intr_0_r()); hw_irq_count = atomic_read(&g->hw_irq_stall_count); @@ -111,7 +111,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g) wake_up_all(&g->sw_irq_stall_last_handled_wq); - trace_mc_gk20a_intr_thread_stall_done(g->dev->name); + trace_mc_gk20a_intr_thread_stall_done(dev_name(g->dev)); return IRQ_HANDLED; } -- cgit v1.2.2