diff --git a/drivers/gpu/nvgpu/include/nvgpu/firmware.h b/drivers/gpu/nvgpu/include/nvgpu/firmware.h
index 54d679566..c78ba0380 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/firmware.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/firmware.h
@@ -1,5 +1,5 @@
 /*
- * 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"),
@@ -27,8 +27,8 @@
 
 struct gk20a;
 
-#define NVGPU_REQUEST_FIRMWARE_NO_WARN		(1UL << 0)
-#define NVGPU_REQUEST_FIRMWARE_NO_SOC		(1UL << 1)
+#define NVGPU_REQUEST_FIRMWARE_NO_WARN		BIT32(0)
+#define NVGPU_REQUEST_FIRMWARE_NO_SOC		BIT32(1)
 
 struct nvgpu_firmware {
 	u8 *data;
@@ -61,7 +61,7 @@ struct nvgpu_firmware {
  */
 struct nvgpu_firmware *nvgpu_request_firmware(struct gk20a *g,
 					      const char *fw_name,
-					      int flags);
+					      u32 flags);
 
 /**
  * nvgpu_release_firmware - free firmware and associated nvgpu_firmware blob
diff --git a/drivers/gpu/nvgpu/os/linux/firmware.c b/drivers/gpu/nvgpu/os/linux/firmware.c
index cc1ccfaba..1510e513a 100644
--- a/drivers/gpu/nvgpu/os/linux/firmware.c
+++ b/drivers/gpu/nvgpu/os/linux/firmware.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-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,
@@ -26,7 +26,7 @@
 #include "os_linux.h"
 
 static const struct firmware *do_request_firmware(struct device *dev,
-		const char *prefix, const char *fw_name, int flags)
+		const char *prefix, const char *fw_name, u32 flags)
 {
 	const struct firmware *fw;
 	char *fw_path = NULL;
@@ -61,7 +61,7 @@ static const struct firmware *do_request_firmware(struct device *dev,
  * responsible for calling nvgpu_release_firmware later. */
 struct nvgpu_firmware *nvgpu_request_firmware(struct gk20a *g,
 					      const char *fw_name,
-					      int flags)
+					      u32 flags)
 {
 	struct device *dev = dev_from_gk20a(g);
 	struct nvgpu_firmware *fw;
diff --git a/drivers/gpu/nvgpu/os/posix/firmware.c b/drivers/gpu/nvgpu/os/posix/firmware.c
index aedfef9f2..b648da269 100644
--- a/drivers/gpu/nvgpu/os/posix/firmware.c
+++ b/drivers/gpu/nvgpu/os/posix/firmware.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018-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"),
@@ -24,7 +24,7 @@
 
 struct nvgpu_firmware *nvgpu_request_firmware(struct gk20a *g,
 					      const char *fw_name,
-					      int flags)
+					      u32 flags)
 {
 	return NULL;
 }