[flashrom-gerrit] [S] Change in flashrom[master]: tree/: Make driver init func names consistent

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/71748 )

Change subject: tree/: Make driver init func names consistent
......................................................................

tree/: Make driver init func names consistent

Almost the whole tree has the form 'name_bus_init()'.
Make the few exceptions consistent with the rest of
the tree for easy grep.

Change-Id: I275af7cc2e6911670c646b15775fcd721ed9fe99
Signed-off-by: Edward O'Callaghan 
---
M chipset_enable.c
M ichspi.c
M include/programmer.h
M internal.c
M it87spi.c
M sb600spi.c
6 files changed, 25 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/48/71748/1

diff --git a/chipset_enable.c b/chipset_enable.c
index b9144d1..cd82366 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -817,7 +817,7 @@
    void *spibar = rcrb + spibar_offset;

/* This adds BUS_SPI */
-	int ret_spi = ich_init_spi(cfg, spibar, ich_generation);
+	int ret_spi = ichspi_init(cfg, spibar, ich_generation);
    if (ret_spi == ERROR_FLASHROM_FATAL)
    	return ret_spi;

@@ -961,7 +961,7 @@
    msg_pdbg("SPIBAR = 0x%0*" PRIxPTR " (phys = 0x%08x)\n", PRIxPTR_WIDTH, (uintptr_t)spibar, phys_spibar);

/* This adds BUS_SPI */
-	const int ret_spi = ich_init_spi(cfg, spibar, pch_generation);
+	const int ret_spi = ichspi_init(cfg, spibar, pch_generation);
    if (ret_spi != ERROR_FLASHROM_FATAL) {
    	if (ret_bc || ret_spi)
    		ret = ERROR_FLASHROM_NONFATAL;
@@ -1078,7 +1078,7 @@
     */
    enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC);

-	int ret_spi = ich_init_spi(cfg, spibar, ich_generation);
+	int ret_spi = ichspi_init(cfg, spibar, ich_generation);
    if (ret_spi == ERROR_FLASHROM_FATAL)
    	return ret_spi;

@@ -1408,7 +1408,7 @@

internal_buses_supported &= BUS_LPC | BUS_FWH;

-	ret = sb600_probe_spi(cfg, dev);
+	ret = sb600spi_init(cfg, dev);

/* Read ROM strap override register. */
    OUTB(0x8f, 0xcd6);
diff --git a/ichspi.c b/ichspi.c
index 1522d2b..2ea8a74 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -2356,7 +2356,7 @@
    return 0;
 }

-int ich_init_spi(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen)
+int ichspi_init(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen)
 {
    ich_generation = ich_gen;
    ich_spibar = spibar;
diff --git a/include/programmer.h b/include/programmer.h
index ad3c502..1cbaf6c 100644
--- a/include/programmer.h
+++ b/include/programmer.h
@@ -363,7 +363,7 @@

/* ichspi.c */
 #if CONFIG_INTERNAL == 1
-int ich_init_spi(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_generation);
+int ichspi_init(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_generation);
 int via_init_spi(uint32_t mmio_base);

/* amd_imc.c */
@@ -373,7 +373,7 @@
 void enter_conf_mode_ite(uint16_t port);
 void exit_conf_mode_ite(uint16_t port);
 void probe_superio_ite(void);
-int init_superio_ite(const struct programmer_cfg *cfg);
+int ite_superio_init(const struct programmer_cfg *cfg);

/* trivial wrapper to avoid cluttering internal_init() with #if */
 static inline int try_mtd(const struct programmer_cfg *cfg)
@@ -391,7 +391,7 @@

/* sb600spi.c */
-int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev);
+int sb600spi_init(const struct programmer_cfg *cfg, struct pci_dev *dev);

/* wbsio_spi.c */
 int wbsio_check_for_spi(void);
diff --git a/internal.c b/internal.c
index 1161652..f477903 100644
--- a/internal.c
+++ b/internal.c
@@ -298,7 +298,7 @@
 #if defined(__i386__) || defined(__x86_64__)
    /* Probe unconditionally for ITE Super I/O chips. This enables LPC->SPI translation on IT87* and
     * parallel writes on IT8705F. Also, this handles the manual chip select for Gigabyte's DualBIOS. */
-	init_superio_ite(cfg);
+	ite_superio_init(cfg);

if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) {
    	msg_perr("Aborting to be safe.\n");
diff --git a/it87spi.c b/it87spi.c
index 34dbea0..601e8dc 100644
--- a/it87spi.c
+++ b/it87spi.c
@@ -443,7 +443,7 @@
    return register_spi_master(&spi_master_it87xx, data);
 }

-int init_superio_ite(const struct programmer_cfg *cfg)
+int ite_superio_init(const struct programmer_cfg *cfg)
 {
    int i;
    int ret = 0;
diff --git a/sb600spi.c b/sb600spi.c
index 5b9ac45..6e11e53 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -634,7 +634,7 @@
    .probe_opcode	= default_spi_probe_opcode,
 };

-int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev)
+int sb600spi_init(const struct programmer_cfg *cfg, struct pci_dev *dev)
 {
    struct pci_dev *smbus_dev;
    uint32_t tmp;