diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
index 3fc8b73b6..37a349504 100644
--- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
+++ b/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_hal_gm20b.c
@@ -470,7 +470,6 @@ static const struct gpu_ops vgpu_gm20b_ops = {
 int vgpu_gm20b_init_hal(struct gk20a *g)
 {
 	struct gpu_ops *gops = &g->ops;
-	struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
 	u32 val;
 
 	gops->ltc = vgpu_gm20b_ops.ltc;
@@ -586,12 +585,5 @@ int vgpu_gm20b_init_hal(struct gk20a *g)
 
 	g->name = "gm20b";
 
-	c->twod_class = FERMI_TWOD_A;
-	c->threed_class = MAXWELL_B;
-	c->compute_class = MAXWELL_COMPUTE_B;
-	c->gpfifo_class = MAXWELL_CHANNEL_GPFIFO_A;
-	c->inline_to_memory_class = KEPLER_INLINE_TO_MEMORY_B;
-	c->dma_copy_class = MAXWELL_DMA_COPY_A;
-
 	return 0;
 }
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index e4e5a8859..693709efa 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -511,7 +511,6 @@ static const struct gpu_ops vgpu_gp10b_ops = {
 int vgpu_gp10b_init_hal(struct gk20a *g)
 {
 	struct gpu_ops *gops = &g->ops;
-	struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
 	u32 val;
 
 	gops->ltc = vgpu_gp10b_ops.ltc;
@@ -628,12 +627,5 @@ int vgpu_gp10b_init_hal(struct gk20a *g)
 
 	g->name = "gp10b";
 
-	c->twod_class = FERMI_TWOD_A;
-	c->threed_class = PASCAL_A;
-	c->compute_class = PASCAL_COMPUTE_A;
-	c->gpfifo_class = PASCAL_CHANNEL_GPFIFO_A;
-	c->inline_to_memory_class = KEPLER_INLINE_TO_MEMORY_B;
-	c->dma_copy_class = PASCAL_DMA_COPY_A;
-
 	return 0;
 }