[coreboot-gerrit] Change in coreboot[master]: soc/intel/{cannonlake, skylake}: Add _soc_ prefix in spi soc routine

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/22392


Change subject: soc/intel/{cannonlake,skylake}: Add _soc_ prefix in spi soc routine
......................................................................

soc/intel/{cannonlake,skylake}: Add _soc_ prefix in spi soc routine

This ensures that function callback into the SoC code.

Change-Id: Idc16d315ba25d17a2ab537fcdf0c2b51c8802a67
Signed-off-by: Subrata Banik <subrata.banik at intel.com>
---
M src/soc/intel/cannonlake/include/soc/pci_devs.h
M src/soc/intel/cannonlake/spi.c
M src/soc/intel/skylake/include/soc/pci_devs.h
M src/soc/intel/skylake/spi.c
4 files changed, 5 insertions(+), 5 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/22392/1

diff --git a/src/soc/intel/cannonlake/include/soc/pci_devs.h b/src/soc/intel/cannonlake/include/soc/pci_devs.h
index 285fbd6..52245df 100644
--- a/src/soc/intel/cannonlake/include/soc/pci_devs.h
+++ b/src/soc/intel/cannonlake/include/soc/pci_devs.h
@@ -175,7 +175,7 @@
 #define  PCH_DEV_GBE		_PCH_DEV(LPC, 6)
 #define  PCH_DEV_TRACEHUB	_PCH_DEV(LPC, 7)
 
-static inline int spi_devfn_to_bus(unsigned int devfn)
+static inline int spi_soc_devfn_to_bus(unsigned int devfn)
 {
 	switch (devfn) {
 	case PCH_DEVFN_SPI: return 0;
diff --git a/src/soc/intel/cannonlake/spi.c b/src/soc/intel/cannonlake/spi.c
index 1d65dee..7b702ad 100644
--- a/src/soc/intel/cannonlake/spi.c
+++ b/src/soc/intel/cannonlake/spi.c
@@ -40,7 +40,7 @@
 
 static int spi_dev_to_bus(struct device *dev)
 {
-	return spi_devfn_to_bus(dev->path.pci.devfn);
+	return spi_soc_devfn_to_bus(dev->path.pci.devfn);
 }
 
 static struct spi_bus_operations spi_bus_ops = {
diff --git a/src/soc/intel/skylake/include/soc/pci_devs.h b/src/soc/intel/skylake/include/soc/pci_devs.h
index c8a5e47..081a04b 100644
--- a/src/soc/intel/skylake/include/soc/pci_devs.h
+++ b/src/soc/intel/skylake/include/soc/pci_devs.h
@@ -160,7 +160,7 @@
 #define  PCH_DEV_GBE		_PCH_DEV(LPC, 6)
 #define  PCH_DEV_TRACEHUB	_PCH_DEV(LPC, 7)
 
-static inline int spi_devfn_to_bus(unsigned int devfn)
+static inline int spi_soc_devfn_to_bus(unsigned int devfn)
 {
 	switch (devfn) {
 	case PCH_DEVFN_SPI: return 0;
@@ -170,7 +170,7 @@
 	return -1;
 }
 
-static inline int spi_bus_to_devfn(unsigned int bus)
+static inline int spi_soc_bus_to_devfn(unsigned int bus)
 {
 	switch (bus) {
 	case 0: return PCH_DEVFN_SPI;
diff --git a/src/soc/intel/skylake/spi.c b/src/soc/intel/skylake/spi.c
index e575e6e..7266edd 100644
--- a/src/soc/intel/skylake/spi.c
+++ b/src/soc/intel/skylake/spi.c
@@ -39,7 +39,7 @@
 
 static int spi_dev_to_bus(struct device *dev)
 {
-	return spi_devfn_to_bus(dev->path.pci.devfn);
+	return spi_soc_devfn_to_bus(dev->path.pci.devfn);
 }
 
 static struct spi_bus_operations spi_bus_ops = {

-- 
To view, visit https://review.coreboot.org/22392
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc16d315ba25d17a2ab537fcdf0c2b51c8802a67
Gerrit-Change-Number: 22392
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subrata.banik at intel.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171109/e67fd4e0/attachment.html>