From d482c7dace772278d988682e94247e3801587ff7 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 3 Jan 2019 11:38:35 +0200 Subject: amdfam10 boards: Drop global bus_isa variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Value of the global is never evaluated. Change-Id: I74106b0f5f033053288882a5bcd3c1dba3235ac0 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/30628 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Angel Pons --- src/mainboard/asus/kcma-d8/get_bus_conf.c | 6 ------ src/mainboard/asus/kcma-d8/irq_tables.c | 1 - src/mainboard/asus/kfsn4-dre/irq_tables.c | 1 - src/mainboard/asus/kgpe-d16/get_bus_conf.c | 6 ------ src/mainboard/asus/kgpe-d16/irq_tables.c | 1 - src/mainboard/asus/m5a88-v/get_bus_conf.c | 8 -------- src/mainboard/asus/m5a88-v/irq_tables.c | 1 - src/mainboard/asus/m5a88-v/mptable.c | 2 +- 8 files changed, 1 insertion(+), 25 deletions(-) (limited to 'src/mainboard/asus') diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c index 73599fb2d2..7f1da1b8cb 100644 --- a/src/mainboard/asus/kcma-d8/get_bus_conf.c +++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c @@ -25,7 +25,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sr5650[14]; u8 bus_sp5100[2]; u32 apicid_sp5100; @@ -91,8 +90,6 @@ void get_bus_conf(void) dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4)); if (dev) { bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } /* sr5650 */ @@ -101,14 +98,11 @@ void get_bus_conf(void) if (dev) { bus_sr5650[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); if(255 != bus_sr5650[i]) { - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; if (IS_ENABLED(CONFIG_LOGICAL_CPUS)) apicid_base = get_apicid_base(1); else diff --git a/src/mainboard/asus/kcma-d8/irq_tables.c b/src/mainboard/asus/kcma-d8/irq_tables.c index fa7b22aa99..2ff8a7ad7a 100644 --- a/src/mainboard/asus/kcma-d8/irq_tables.c +++ b/src/mainboard/asus/kcma-d8/irq_tables.c @@ -60,7 +60,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sr5650[14]; extern u8 bus_sp5100[2]; extern u32 sbdn_sp5100; diff --git a/src/mainboard/asus/kfsn4-dre/irq_tables.c b/src/mainboard/asus/kfsn4-dre/irq_tables.c index 0a990a7518..139b400a0a 100644 --- a/src/mainboard/asus/kfsn4-dre/irq_tables.c +++ b/src/mainboard/asus/kfsn4-dre/irq_tables.c @@ -30,7 +30,6 @@ #include #include -extern unsigned char bus_isa; extern unsigned char bus_ck804[6]; diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c index 73599fb2d2..7f1da1b8cb 100644 --- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c +++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c @@ -25,7 +25,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sr5650[14]; u8 bus_sp5100[2]; u32 apicid_sp5100; @@ -91,8 +90,6 @@ void get_bus_conf(void) dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4)); if (dev) { bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } /* sr5650 */ @@ -101,14 +98,11 @@ void get_bus_conf(void) if (dev) { bus_sr5650[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); if(255 != bus_sr5650[i]) { - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; if (IS_ENABLED(CONFIG_LOGICAL_CPUS)) apicid_base = get_apicid_base(1); else diff --git a/src/mainboard/asus/kgpe-d16/irq_tables.c b/src/mainboard/asus/kgpe-d16/irq_tables.c index fa7b22aa99..2ff8a7ad7a 100644 --- a/src/mainboard/asus/kgpe-d16/irq_tables.c +++ b/src/mainboard/asus/kgpe-d16/irq_tables.c @@ -60,7 +60,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sr5650[14]; extern u8 bus_sp5100[2]; extern u32 sbdn_sp5100; diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c index 41dfe37f46..c7268c6030 100644 --- a/src/mainboard/asus/m5a88-v/get_bus_conf.c +++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c @@ -23,7 +23,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -int bus_isa; u8 bus_rs780[11]; u8 bus_sb800[6]; u32 apicid_sb800; @@ -88,16 +87,12 @@ void get_bus_conf(void) dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, 4)); if (dev) { bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x15, i)); if (dev) { bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } @@ -107,14 +102,11 @@ void get_bus_conf(void) if (dev) { bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); if(255 != bus_rs780[i]) { - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; if (IS_ENABLED(CONFIG_LOGICAL_CPUS)) apicid_base = get_apicid_base(1); else diff --git a/src/mainboard/asus/m5a88-v/irq_tables.c b/src/mainboard/asus/m5a88-v/irq_tables.c index 3a76d96684..fc5edca3e0 100644 --- a/src/mainboard/asus/m5a88-v/irq_tables.c +++ b/src/mainboard/asus/m5a88-v/irq_tables.c @@ -39,7 +39,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_rs780[8]; extern u8 bus_sb800[6]; extern unsigned long sbdn_sb800; diff --git a/src/mainboard/asus/m5a88-v/mptable.c b/src/mainboard/asus/m5a88-v/mptable.c index cada29aaa8..a5a6b4e825 100644 --- a/src/mainboard/asus/m5a88-v/mptable.c +++ b/src/mainboard/asus/m5a88-v/mptable.c @@ -20,7 +20,6 @@ #include #include -extern int bus_isa; extern u8 bus_rs780[11]; extern u8 bus_sb800[6]; extern u32 apicid_sb800; @@ -40,6 +39,7 @@ u8 intr_data[] = { static void *smp_write_config_table(void *v) { struct mp_config_table *mc; + int bus_isa; u32 dword = 0; u8 byte; -- cgit v1.2.3