5 files changed, 10 insertions, 10 deletions
diff --git a/src/intel/common/gen_device_info.c b/src/intel/common/gen_device_info.c
index 6ee55e1..7f1af19 100644
--- a/src/intel/common/gen_device_info.c
+++ b/src/intel/common/gen_device_info.c
@@ -488,7 +488,7 @@ static const struct gen_device_info gen_device_info_kbl_gt4 = {
 };
 
 const struct gen_device_info *
-brw_get_device_info(int devid)
+gen_get_device_info(int devid)
 {
    const struct gen_device_info *devinfo;
    switch (devid) {
@@ -505,7 +505,7 @@ brw_get_device_info(int devid)
 }
 
 const char *
-brw_get_device_name(int devid)
+gen_get_device_name(int devid)
 {
    switch (devid) {
 #undef CHIPSET
diff --git a/src/intel/common/gen_device_info.h b/src/intel/common/gen_device_info.h
index ea1b750..6b639d3 100644
--- a/src/intel/common/gen_device_info.h
+++ b/src/intel/common/gen_device_info.h
@@ -143,5 +143,5 @@ struct gen_device_info
    /** @} */
 };
 
-const struct gen_device_info *brw_get_device_info(int devid);
-const char *brw_get_device_name(int devid);
+const struct gen_device_info *gen_get_device_info(int devid);
+const char *gen_get_device_name(int devid);
diff --git a/src/intel/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
index 8c44b37..5ce326f 100644
--- a/src/intel/isl/tests/isl_surf_get_image_offset_test.c
+++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
@@ -125,7 +125,7 @@ test_bdw_2d_r8g8b8a8_unorm_512x512_array01_samples01_noaux_tiley0(void)
    bool ok;
 
    struct isl_device dev;
-   isl_device_init(&dev, brw_get_device_info(BDW_GT2_DEVID),
+   isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID),
                    /*bit6_swizzle*/ false);
 
    struct isl_surf surf;
@@ -171,7 +171,7 @@ test_bdw_2d_r8g8b8a8_unorm_1024x1024_array06_samples01_noaux_tiley0(void)
    bool ok;
 
    struct isl_device dev;
-   isl_device_init(&dev, brw_get_device_info(BDW_GT2_DEVID),
+   isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID),
                    /*bit6_swizzle*/ false);
 
    struct isl_surf surf;
@@ -230,7 +230,7 @@ test_bdw_3d_r8g8b8a8_unorm_256x256x256_levels09_tiley0(void)
    bool ok;
 
    struct isl_device dev;
-   isl_device_init(&dev, brw_get_device_info(BDW_GT2_DEVID),
+   isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID),
                    /*bit6_swizzle*/ false);
 
    struct isl_surf surf;
diff --git a/src/intel/tools/disasm.c b/src/intel/tools/disasm.c
index 29c0641..ddbfa9f 100644
--- a/src/intel/tools/disasm.c
+++ b/src/intel/tools/disasm.c
@@ -95,7 +95,7 @@ gen_disasm_create(int pciid)
    if (gd == NULL)
       return NULL;
 
-   dev_info = brw_get_device_info(pciid);
+   dev_info = gen_get_device_info(pciid);
 
    gd->devinfo.gen = dev_info->gen;
    gd->devinfo.is_cherryview = dev_info->is_cherryview;
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 08dfa18..7317493 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -76,8 +76,8 @@ anv_physical_device_init(struct anv_physical_device *device,
       goto fail;
    }
 
-   device->name = brw_get_device_name(device->chipset_id);
-   device->info = brw_get_device_info(device->chipset_id);
+   device->name = gen_get_device_name(device->chipset_id);
+   device->info = gen_get_device_info(device->chipset_id);
    if (!device->info) {
       result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
       goto fail;