diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index f396b28327808..e0680d265a667 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1574,7 +1574,6 @@ static int kfd_create_indirect_link_prop(struct kfd_topology_device *kdev, int g
 	return ret;
 }
 
-#if defined(CONFIG_HSA_AMD_P2P)
 static int kfd_add_peer_prop(struct kfd_topology_device *kdev,
 		struct kfd_topology_device *peer, int from, int to)
 {
@@ -1638,16 +1637,12 @@ static int kfd_add_peer_prop(struct kfd_topology_device *kdev,
 
 	return ret;
 }
-#endif
 
 static int kfd_dev_create_p2p_links(void)
 {
 	struct kfd_topology_device *dev;
 	struct kfd_topology_device *new_dev;
-#if defined(CONFIG_HSA_AMD_P2P)
-	uint32_t i;
-#endif
-	uint32_t k;
+	uint32_t i, k;
 	int ret = 0;
 
 	k = 0;
@@ -1668,7 +1663,6 @@ static int kfd_dev_create_p2p_links(void)
 		goto out;
 
 	/* create p2p links */
-#if defined(CONFIG_HSA_AMD_P2P)
 	i = 0;
 	list_for_each_entry(dev, &topology_device_list, list) {
 		if (dev == new_dev)
@@ -1689,7 +1683,6 @@ static int kfd_dev_create_p2p_links(void)
 next:
 		i++;
 	}
-#endif
 
 out:
 	return ret;