summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux/firmware.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/firmware.c')
-rw-r--r--drivers/gpu/nvgpu/common/linux/firmware.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/common/linux/firmware.c
index b49bc4a3..44ff1507 100644
--- a/drivers/gpu/nvgpu/common/linux/firmware.c
+++ b/drivers/gpu/nvgpu/common/linux/firmware.c
@@ -44,14 +44,10 @@ static const struct firmware *do_request_firmware(struct device *dev,
44 fw_name = fw_path; 44 fw_name = fw_path;
45 } 45 }
46 46
47#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
48 err = request_firmware(&fw, fw_name, dev);
49#else
50 if (flags & NVGPU_REQUEST_FIRMWARE_NO_WARN) 47 if (flags & NVGPU_REQUEST_FIRMWARE_NO_WARN)
51 err = request_firmware_direct(&fw, fw_name, dev); 48 err = request_firmware_direct(&fw, fw_name, dev);
52 else 49 else
53 err = request_firmware(&fw, fw_name, dev); 50 err = request_firmware(&fw, fw_name, dev);
54#endif
55 51
56 nvgpu_kfree(get_gk20a(dev), fw_path); 52 nvgpu_kfree(get_gk20a(dev), fw_path);
57 if (err) 53 if (err)