From 02dd414a536da1e40a8d879de27e3eea76c30e3d Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 13 Dec 2018 13:02:03 -0800 Subject: [PATCH] gpu: nvgpu: Remove extra defs of BOOT_GPC2CLK BOOT_GPC2CLK was defined in clk.c and clk.h, but not used there. Move the definition to the only user of BOOT_GPC2CLK, which is pci.c. JIRA NVGPU-961 Change-Id: Idff290fb447390b44ee09eab853e434e124e84bb Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1986069 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/clk/clk.c | 1 - drivers/gpu/nvgpu/clk/clk.h | 4 +--- drivers/gpu/nvgpu/os/linux/pci.c | 5 +++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c index 2bb6f5d86..615100066 100644 --- a/drivers/gpu/nvgpu/clk/clk.c +++ b/drivers/gpu/nvgpu/clk/clk.c @@ -33,7 +33,6 @@ #include "clk.h" #include -#define BOOT_GPC2CLK_MHZ 2581U #define BOOT_MCLK_MHZ 3003U struct clkrpc_pmucmdhandler_params { diff --git a/drivers/gpu/nvgpu/clk/clk.h b/drivers/gpu/nvgpu/clk/clk.h index a3e3e715b..cb89aed13 100644 --- a/drivers/gpu/nvgpu/clk/clk.h +++ b/drivers/gpu/nvgpu/clk/clk.h @@ -1,7 +1,7 @@ /* * general clock structures & definitions * - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -125,8 +125,6 @@ struct vbios_clocks_table_1x_hal_clock_entry { #define PERF_CLK_PCIEGENCLK 12U #define PERF_CLK_NUM 13U -#define BOOT_GPC2CLK_MHZ 2581U - int clk_init_pmupstate(struct gk20a *g); void clk_free_pmupstate(struct gk20a *g); int clk_pmu_vin_load(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/os/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c index 28b545ad4..b131d5289 100644 --- a/drivers/gpu/nvgpu/os/linux/pci.c +++ b/drivers/gpu/nvgpu/os/linux/pci.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2019, 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, @@ -45,7 +45,8 @@ #include "driver_common.h" -#define PCI_INTERFACE_NAME "card-%s%%s" +#define BOOT_GPC2CLK_MHZ 2581U +#define PCI_INTERFACE_NAME "card-%s%%s" static int nvgpu_pci_tegra_probe(struct device *dev) {