From 560111e2ce506b75b112f0d10b5f9b99f007bfa5 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 26 Apr 2017 12:27:17 +0200 Subject: [PATCH] ichspi: Drop `dev` parameter from init functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's never used and has no clear contract (e.g. will the pointer stay valid beyond the call?). Change-Id: I0d4e7cc731364e86eff214b9022b842a577f9ef4 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/19460 Tested-by: build bot (Jenkins) Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Reinauer --- chipset_enable.c | 8 ++++---- ichspi.c | 4 ++-- programmer.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chipset_enable.c b/chipset_enable.c index 208cd3a95..83c470fa6 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -718,7 +718,7 @@ static int enable_flash_ich_spi(struct pci_dev *dev, enum ich_chipset ich_genera void *spibar = rcrb + spibar_offset; /* This adds BUS_SPI */ - int ret_spi = ich_init_spi(dev, spibar, ich_generation); + int ret_spi = ich_init_spi(spibar, ich_generation); if (ret_spi == ERROR_FATAL) return ret_spi; @@ -846,7 +846,7 @@ static int enable_flash_silvermont(struct pci_dev *dev, const char *name) */ enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC); - int ret_spi = ich_init_spi(dev, spibar, ich_generation); + int ret_spi = ich_init_spi(spibar, ich_generation); if (ret_spi == ERROR_FATAL) return ret_spi; @@ -949,12 +949,12 @@ static int enable_flash_vt_vx(struct pci_dev *dev, const char *name) return ERROR_FATAL; } - return via_init_spi(dev, spi0_mm_base); + return via_init_spi(spi0_mm_base); } static int enable_flash_vt8237s_spi(struct pci_dev *dev, const char *name) { - return via_init_spi(dev, pci_read_long(dev, 0xbc) << 8); + return via_init_spi(pci_read_long(dev, 0xbc) << 8); } static int enable_flash_cs5530(struct pci_dev *dev, const char *name) diff --git a/ichspi.c b/ichspi.c index e1395ee08..218e3b12f 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1561,7 +1561,7 @@ static const struct opaque_master opaque_master_ich_hwseq = { .erase = ich_hwseq_block_erase, }; -int ich_init_spi(struct pci_dev *dev, void *spibar, enum ich_chipset ich_gen) +int ich_init_spi(void *spibar, enum ich_chipset ich_gen) { int i; uint16_t tmp2; @@ -1828,7 +1828,7 @@ static const struct spi_master spi_master_via = { .write_aai = default_spi_write_aai, }; -int via_init_spi(struct pci_dev *dev, uint32_t mmio_base) +int via_init_spi(uint32_t mmio_base) { int i; diff --git a/programmer.h b/programmer.h index 9beaf98ac..fd9da9657 100644 --- a/programmer.h +++ b/programmer.h @@ -655,8 +655,8 @@ enum ich_chipset { /* ichspi.c */ #if CONFIG_INTERNAL == 1 extern uint32_t ichspi_bbar; -int ich_init_spi(struct pci_dev *dev, void *spibar, enum ich_chipset ich_generation); -int via_init_spi(struct pci_dev *dev, uint32_t mmio_base); +int ich_init_spi(void *spibar, enum ich_chipset ich_generation); +int via_init_spi(uint32_t mmio_base); /* amd_imc.c */ int amd_imc_shutdown(struct pci_dev *dev);