From 78b40335841eae958865f67ac8ee0020fd43aead Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 17 Mar 2010 22:09:26 +0000 Subject: more warnings gone... Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5254 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/southbridge/amd/sb700/sb700_hda.c | 18 +++++++++--------- src/southbridge/amd/sb700/sb700_usb.c | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/southbridge/amd/sb700') diff --git a/src/southbridge/amd/sb700/sb700_hda.c b/src/southbridge/amd/sb700/sb700_hda.c index 12839a6a4b..2f55c944c7 100644 --- a/src/southbridge/amd/sb700/sb700_hda.c +++ b/src/southbridge/amd/sb700/sb700_hda.c @@ -30,7 +30,7 @@ #define HDA_ICII_BUSY (1 << 0) #define HDA_ICII_VALID (1 << 1) -static int set_bits(u8 * port, u32 mask, u32 val) +static int set_bits(u32 port, u32 mask, u32 val) { u32 dword; int count; @@ -59,7 +59,7 @@ static int set_bits(u8 * port, u32 mask, u32 val) return 0; } -static u32 codec_detect(u8 * base) +static u32 codec_detect(u32 base) { u32 dword; @@ -94,7 +94,7 @@ no_codec: * Wait 50usec for for the codec to indicate it is ready * no response would imply that the codec is non-operative */ -static int wait_for_ready(u8 *base) +static int wait_for_ready(u32 base) { /* Use a 50 usec timeout - the Linux kernel uses the * same duration */ @@ -116,7 +116,7 @@ static int wait_for_ready(u8 *base) * the previous command. No response would imply that the code * is non-operative */ -static int wait_for_valid(u8 *base) +static int wait_for_valid(u32 base) { /* Use a 50 usec timeout - the Linux kernel uses the * same duration */ @@ -133,7 +133,7 @@ static int wait_for_valid(u8 *base) return 1; } -static void codec_init(u8 * base, int addr) +static void codec_init(u32 base, int addr) { u32 dword; @@ -153,7 +153,7 @@ static void codec_init(u8 * base, int addr) printk_debug("%x(th) codec viddid: %08x\n", addr, dword); } -static void codecs_init(u8 * base, u32 codec_mask) +static void codecs_init(u32 base, u32 codec_mask) { int i; for (i = 2; i >= 0; i--) { @@ -166,7 +166,7 @@ static void hda_init(struct device *dev) { u8 byte; u32 dword; - u8 *base; + u32 base; struct resource *res; u32 codec_mask; device_t sm_dev; @@ -202,8 +202,8 @@ static void hda_init(struct device *dev) if (!res) return; - base = (u8 *) ((u32)res->base); - printk_debug("base = %p\n", base); + base = (u32)res->base; + printk_debug("base = 0x%x\n", base); codec_mask = codec_detect(base); if (codec_mask) { diff --git a/src/southbridge/amd/sb700/sb700_usb.c b/src/southbridge/amd/sb700/sb700_usb.c index b567fd5e5c..63679b8847 100644 --- a/src/southbridge/amd/sb700/sb700_usb.c +++ b/src/southbridge/amd/sb700/sb700_usb.c @@ -34,7 +34,6 @@ static void usb_init(struct device *dev) { u8 byte; u16 word; - u32 dword; /* 6.1 Enable OHCI0-4 and EHCI Controllers */ device_t sm_dev; @@ -70,10 +69,8 @@ static void usb_init(struct device *dev) static void usb_init2(struct device *dev) { - u8 byte; - u16 word; u32 dword; - u8 *usb2_bar0; + u32 usb2_bar0; device_t sm_dev; u8 rev; @@ -84,8 +81,8 @@ static void usb_init2(struct device *dev) /* dword |= 40; */ /* pci_write_config32(dev, 0xf8, dword); */ - usb2_bar0 = (u8 *) (pci_read_config32(dev, 0x10) & ~0xFF); - printk_info("usb2_bar0=%p\n", usb2_bar0); + usb2_bar0 = pci_read_config32(dev, 0x10) & ~0xFF; + printk_info("usb2_bar0=0x%x\n", usb2_bar0); /* RPR6.4 Enables the USB PHY auto calibration resister to match 45ohm resistence */ dword = 0x00020F00; @@ -123,6 +120,9 @@ static void usb_init2(struct device *dev) /* Each step below causes the linux crashes. Leave them here * for future debugging. */ #if 0 + u8 byte; + u16 word; + /* RPR6.16 Disable EHCI MSI support */ byte = pci_read_config8(dev, 0x50); byte |= (1 << 6); -- cgit v1.2.3