4 files changed, 5 insertions, 5 deletions

diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index 371581b77afd..fb941ab24bc2 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -177,7 +177,7 @@ void acpi_fill_in_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
 	acpi_header_t *header = &(fadt->header);
 	struct device *lpcdev = pcidev_path_on_root(FADT_SOC_LPC_DEVFN);
 	u16 pmbase = pci_read_config16(lpcdev, ABASE) & 0xfff0;
-	config_t *config = lpcdev->chip_info;
+	config_t *config = config_of(lpcdev);
 
 	memset((void *) fadt, 0, sizeof(acpi_fadt_t));
 
diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
index 7e901422502d..f11b206ed47b 100644
--- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
+++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
@@ -87,7 +87,7 @@ static void ConfigureDefaultUpdData(FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *U
 	printk(FSP_INFO_LEVEL, "Configure Default UPD Data\n");
 
 	dev = pcidev_path_on_root(SOC_DEV_FUNC);
-	config = dev->chip_info;
+	config = config_of(dev);
 
 	/* Set up default verb tables - Just HDMI audio */
 	UpdData->AzaliaConfigPtr = (UINT32)&mAzaliaConfig;
diff --git a/src/soc/intel/fsp_baytrail/lpe.c b/src/soc/intel/fsp_baytrail/lpe.c
index 8373b91931f6..8baba3e2952b 100644
--- a/src/soc/intel/fsp_baytrail/lpe.c
+++ b/src/soc/intel/fsp_baytrail/lpe.c
@@ -91,7 +91,7 @@ static void setup_codec_clock(struct device *dev)
 	struct soc_intel_fsp_baytrail_config *config;
 	const char *freq_str;
 
-	config = dev->chip_info;
+	config = config_of(dev);
 	switch (config->lpe_codec_clk_freq) {
 	case 19:
 		freq_str = "19.2";
@@ -150,7 +150,7 @@ static void lpe_stash_firmware_info(struct device *dev)
 
 static void lpe_init(struct device *dev)
 {
-	struct soc_intel_fsp_baytrail_config *config = dev->chip_info;
+	struct soc_intel_fsp_baytrail_config *config = config_of(dev);
 
 	lpe_stash_firmware_info(dev);
 
diff --git a/src/soc/intel/fsp_baytrail/lpss.c b/src/soc/intel/fsp_baytrail/lpss.c
index d644138f4ccc..154a70ad1971 100644
--- a/src/soc/intel/fsp_baytrail/lpss.c
+++ b/src/soc/intel/fsp_baytrail/lpss.c
@@ -147,7 +147,7 @@ static void i2c_disable_resets(struct device *dev)
 
 static void lpss_init(struct device *dev)
 {
-	struct soc_intel_fsp_baytrail_config *config = dev->chip_info;
+	struct soc_intel_fsp_baytrail_config *config = config_of(dev);
 	int iosf_reg, nvs_index;
 
 	dev_ctl_reg(dev, &iosf_reg, &nvs_index);