From 0fd0a054d46673e7375eb4808a3b66952fbd9ad3 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 18 Feb 2013 21:23:16 -0700 Subject: Tyan S8226: Fix incompatible pointer warning Fix warning: mptable.c:52, GNU Compiler 4 (gcc), Priority: Normal passing argument 3 of 'mptable_write_buses' from incompatible pointer type [enabled by default] mptable_write_buses is expecting a pointer to an int, so I changed the U8 isa_bus to an int to match. A U8 doesn't make sense if the value could be greater than 255 - certainly unlikely, but possible since the value of isa_bus gets set to the maximum PCI bus number + 1. Change-Id: I7ea416f48285922d6cf341382109993fd3f6405c Signed-off-by: Martin Roth Reviewed-on: http://review.coreboot.org/2450 Tested-by: build bot (Jenkins) Reviewed-by: Siyuan Wang Reviewed-by: Paul Menzel Reviewed-by: Dave Frodin Reviewed-by: Marc Jones --- src/mainboard/tyan/s8226/get_bus_conf.c | 6 +++--- src/mainboard/tyan/s8226/mptable.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/tyan/s8226/get_bus_conf.c b/src/mainboard/tyan/s8226/get_bus_conf.c index 5171c45804..ef34a99186 100644 --- a/src/mainboard/tyan/s8226/get_bus_conf.c +++ b/src/mainboard/tyan/s8226/get_bus_conf.c @@ -32,7 +32,7 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; +int bus_isa; u8 bus_sp5100[2]; u8 bus_sr5650[14]; @@ -101,7 +101,7 @@ void get_bus_conf(void) if (dev) { bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); + bus_isa = (int)pci_read_config8(dev, PCI_SUBORDINATE_BUS); bus_isa++; for (j = bus_sp5100[1]; j < bus_isa; j++) bus_type[j] = 1; @@ -113,7 +113,7 @@ 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 = (int)pci_read_config8(dev, PCI_SUBORDINATE_BUS); bus_isa++; bus_type[bus_sr5650[i]] = 1; /* PCI bus. */ } diff --git a/src/mainboard/tyan/s8226/mptable.c b/src/mainboard/tyan/s8226/mptable.c index 61a7bd4550..c5c1ab64ae 100644 --- a/src/mainboard/tyan/s8226/mptable.c +++ b/src/mainboard/tyan/s8226/mptable.c @@ -33,7 +33,7 @@ extern u8 bus_sp5100[2]; extern u32 bus_type[256]; extern u32 sbdn_sr5650; extern u32 sbdn_sp5100; -extern u8 bus_isa; +extern int bus_isa; static void *smp_write_config_table(void *v) -- cgit v1.2.3