[coreboot-gerrit] Change in coreboot[master]: arch/x86: Use different name for variables and structs

[Elyes HAOUAS (Code Review)]

Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/26439


Change subject: arch/x86: Use different name for variables and structs
......................................................................

arch/x86: Use different name for variables and structs

My previous changes 'Get ride of device_t' introduced a
confusion by using the same name for variables and structs.

Change-Id: I741f78e2109b03b0611b3ebd2240d65f80974d0a
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
M src/arch/x86/acpi.c
M src/arch/x86/include/arch/acpi.h
2 files changed, 7 insertions(+), 8 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/26439/1

diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 8b6b2c1..b7e4ed2 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -589,9 +589,9 @@
 	header->checksum = acpi_checksum((void *)hpet, sizeof(acpi_hpet_t));
 }
 
-void acpi_create_vfct(struct device *device,
+void acpi_create_vfct(struct device *dev,
 		      struct acpi_vfct *vfct,
-		      unsigned long (*acpi_fill_vfct)(struct device *device,
+		      unsigned long (*acpi_fill_vfct)(struct device *dev,
 		      struct acpi_vfct *vfct_struct, unsigned long current))
 {
 	acpi_header_t *header = &(vfct->header);
@@ -640,7 +640,7 @@
 	header->checksum = acpi_checksum((void *)ivrs, header->length);
 }
 
-unsigned long acpi_write_hpet(struct device *device, unsigned long current,
+unsigned long acpi_write_hpet(struct device *dev, unsigned long current,
 	acpi_rsdp_t *rsdp)
 {
 	acpi_hpet_t *hpet;
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 5480834..6450652 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -705,9 +705,8 @@
 void acpi_create_slit(acpi_slit_t *slit,
 		      unsigned long (*acpi_fill_slit)(unsigned long current));
 
-void acpi_create_vfct(struct device *device,
-		      struct acpi_vfct *vfct,
-		      unsigned long (*acpi_fill_vfct)(struct device *device,
+void acpi_create_vfct(struct device *dev, struct acpi_vfct *vfct,
+		      unsigned long (*acpi_fill_vfct)(struct device *dev,
 				struct acpi_vfct *vfct_struct,
 				unsigned long current));
 
@@ -717,11 +716,11 @@
 
 #if ENV_RAMSTAGE && !defined(__SIMPLE_DEVICE__)
 void acpi_create_hpet(acpi_hpet_t *hpet);
-unsigned long acpi_write_hpet(struct device *device, unsigned long start,
+unsigned long acpi_write_hpet(struct device *dev, unsigned long start,
 			      acpi_rsdp_t *rsdp);
 
 /* cpu/intel/speedstep/acpi.c */
-void generate_cpu_entries(struct device *device);
+void generate_cpu_entries(struct device *dev);
 #endif
 
 void acpi_create_mcfg(acpi_mcfg_t *mcfg);

-- 
To view, visit https://review.coreboot.org/26439
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I741f78e2109b03b0611b3ebd2240d65f80974d0a
Gerrit-Change-Number: 26439
Gerrit-PatchSet: 1
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180521/1cc582f7/attachment-0001.html>