From 093384887fad8e45b2b58540f9ce6821b1bcb8dc Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 8 Mar 2017 16:49:14 -0800 Subject: gpu: nvgpu: Use new kmem API functions (volt/*) Use the new kmem API functions in volt/*. Bug 1799159 Bug 1823380 Change-Id: Ib7bb5b3b3b364ff6acf93f39a72aa5b0a704a3f8 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1318313 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/volt/volt_dev.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/volt/volt_dev.c') diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index 4807f023..12bad36c 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c @@ -13,17 +13,19 @@ #include +#include +#include +#include + #include "gk20a/gk20a.h" +#include "gk20a/pmu_gk20a.h" +#include "gm206/bios_gm206.h" + #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "gm206/bios_gm206.h" #include "ctrl/ctrlvolt.h" -#include "gk20a/pmu_gk20a.h" #include "volt.h" -#include - -#include #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 @@ -135,7 +137,7 @@ struct voltage_device_entry *volt_dev_construct_dev_entry_pwm(struct gk20a *g, struct voltage_device_pwm_entry *ptmp_entry = (struct voltage_device_pwm_entry *)pargs; - pentry = kzalloc(sizeof(struct voltage_device_pwm_entry), GFP_KERNEL); + pentry = nvgpu_kzalloc(g, sizeof(struct voltage_device_pwm_entry)); if (pentry == NULL) return NULL; @@ -200,7 +202,7 @@ static u32 volt_get_voltage_device_table_1x_psv(struct gk20a *g, u8 volt_domain = 0; struct voltage_device_pwm_entry pwm_entry = { { 0 } }; - ptmp_dev = kzalloc(sizeof(struct voltage_device_pwm), GFP_KERNEL); + ptmp_dev = nvgpu_kzalloc(g, sizeof(struct voltage_device_pwm)); if (ptmp_dev == NULL) return -ENOMEM; @@ -349,7 +351,7 @@ done: if (pvolt_dev != NULL) pvolt_dev->num_entries = entry_cnt; - kfree(ptmp_dev); + nvgpu_kfree(g, ptmp_dev); return status; } @@ -579,4 +581,3 @@ done: gk20a_dbg_info(" done status %x", status); return status; } - -- cgit v1.2.2