summaryrefslogtreecommitdiff
path: root/src/drivers/vpd
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/vpd')
-rw-r--r--src/drivers/vpd/vpd.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/drivers/vpd/vpd.c b/src/drivers/vpd/vpd.c
index b81a719176..ab77a01bff 100644
--- a/src/drivers/vpd/vpd.c
+++ b/src/drivers/vpd/vpd.c
@@ -23,7 +23,7 @@ struct vpd_gets_arg {
int matched;
};
-struct vpd_blob g_vpd_blob;
+struct vpd_blob vpd_blob;
/*
* returns the size of data in a VPD 2.0 formatted fmap region, or 0.
@@ -85,10 +85,10 @@ static void vpd_get_blob(void)
if (ro_vpd_size == 0 && rw_vpd_size == 0)
return;
- g_vpd_blob.ro_base = NULL;
- g_vpd_blob.ro_size = 0;
- g_vpd_blob.rw_base = NULL;
- g_vpd_blob.rw_size = 0;
+ vpd_blob.ro_base = NULL;
+ vpd_blob.ro_size = 0;
+ vpd_blob.rw_base = NULL;
+ vpd_blob.rw_size = 0;
struct region_device vpd;
@@ -101,9 +101,9 @@ static void vpd_get_blob(void)
}
rdev_chain(&vpd, &vpd, GOOGLE_VPD_2_0_OFFSET,
region_device_sz(&vpd) - GOOGLE_VPD_2_0_OFFSET);
- g_vpd_blob.ro_base = (uint8_t *)(rdev_mmap_full(&vpd) +
+ vpd_blob.ro_base = (uint8_t *)(rdev_mmap_full(&vpd) +
sizeof(struct google_vpd_info));
- g_vpd_blob.ro_size = ro_vpd_size;
+ vpd_blob.ro_size = ro_vpd_size;
}
if (rw_vpd_size) {
if (fmap_locate_area_as_rdev("RW_VPD", &vpd)) {
@@ -114,19 +114,19 @@ static void vpd_get_blob(void)
}
rdev_chain(&vpd, &vpd, GOOGLE_VPD_2_0_OFFSET,
region_device_sz(&vpd) - GOOGLE_VPD_2_0_OFFSET);
- g_vpd_blob.rw_base = (uint8_t *)(rdev_mmap_full(&vpd) +
+ vpd_blob.rw_base = (uint8_t *)(rdev_mmap_full(&vpd) +
sizeof(struct google_vpd_info));
- g_vpd_blob.rw_size = rw_vpd_size;
+ vpd_blob.rw_size = rw_vpd_size;
}
- g_vpd_blob.initialized = true;
+ vpd_blob.initialized = true;
}
const struct vpd_blob *vpd_load_blob(void)
{
- if (g_vpd_blob.initialized == false)
+ if (vpd_blob.initialized == false)
vpd_get_blob();
- return &g_vpd_blob;
+ return &vpd_blob;
}
static int vpd_gets_callback(const uint8_t *key, uint32_t key_len,