Patchwork Remove warnings of SB700

login
register
about
Submitter Bao, Zheng
Date 2010-03-22 06:23:20
Message ID <DD1CC71B621B004FA76856E5129D6B17038E412D@sbjgexmb1.amd.com>
Download mbox | patch
Permalink /patch/1118/
State Accepted
Headers show

Comments

Bao, Zheng - 2010-03-22 06:23:20
Remove the building warnings.

Signed-off-by: Zheng Bao <zheng.bao@amd.com>
Stefan Reinauer - 2010-03-22 14:12:50
On 3/22/10 7:23 AM, Bao, Zheng wrote:
> Remove the building warnings.
>
> Signed-off-by: Zheng Bao <zheng.bao@amd.com>
>   
Acked-by: Stefan Reinauer <stepan@coresystems.de>

Patch

Index: src/southbridge/amd/sb700/sb700_sata.c
===================================================================
--- src/southbridge/amd/sb700/sb700_sata.c	(revision 5265)
+++ src/southbridge/amd/sb700/sb700_sata.c	(working copy)
@@ -26,7 +26,7 @@ 
 #include <arch/io.h>
 #include "sb700.h"
 
-int sata_drive_detect(int portnum, u16 iobar)
+static int sata_drive_detect(int portnum, u16 iobar)
 {
 	u8 byte, byte2;
 	int i = 0;
@@ -59,7 +59,7 @@ 
 	u16 word;
 	u32 dword;
 	u8 rev_id;
-	u8 *sata_bar5;
+	u32 sata_bar5;
 	u16 sata_bar0, sata_bar1, sata_bar2, sata_bar3, sata_bar4;
 	int i, j;
 
@@ -89,7 +89,7 @@ 
 	rev_id = pci_read_config8(sm_dev, 0x08) - 0x28;
 
 	/* get base addresss */
-	sata_bar5 = (u8 *) (pci_read_config32(dev, 0x24) & ~0x3FF);
+	sata_bar5 = pci_read_config32(dev, 0x24) & ~0x3FF;
 	sata_bar0 = pci_read_config16(dev, 0x10) & ~0x7;
 	sata_bar1 = pci_read_config16(dev, 0x14) & ~0x3;
 	sata_bar2 = pci_read_config16(dev, 0x18) & ~0x7;
@@ -101,7 +101,7 @@ 
 	printk_spew("sata_bar2=%x\n", sata_bar2);	/* 3040 */
 	printk_spew("sata_bar3=%x\n", sata_bar3);	/* 3080 */
 	printk_spew("sata_bar4=%x\n", sata_bar4);	/* 3000 */
-	printk_spew("sata_bar5=%p\n", sata_bar5);	/* e0309000 */
+	printk_spew("sata_bar5=%x\n", sata_bar5);	/* e0309000 */
 
 	/* disable combined mode */
 	byte = pci_read_config8(sm_dev, 0xAD);
Index: src/southbridge/amd/sb700/sb700_smbus.h
===================================================================
--- src/southbridge/amd/sb700/sb700_smbus.h	(revision 5265)
+++ src/southbridge/amd/sb700/sb700_smbus.h	(working copy)
@@ -58,5 +58,8 @@ 
 #define axindxp_reg(reg, mask, val)	\
 	alink_ax_indx(1, (reg), (mask), (val))
 
+int do_smbus_read_byte(u32 smbus_io_base, u32 device, u32 address);
+int do_smbus_write_byte(u32 smbus_io_base, u32 device, u32 address, u8
val);
 
+
 #endif
Index: src/southbridge/amd/sb700/sb700_lpc.c
===================================================================
--- src/southbridge/amd/sb700/sb700_lpc.c	(revision 5265)
+++ src/southbridge/amd/sb700/sb700_lpc.c	(working copy)
@@ -94,7 +94,6 @@ 
 static void sb700_lpc_set_resources(struct device *dev)
 {
 	struct resource *res;
-	u8 byte;
 
 	pci_dev_set_resources(dev);