<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28709">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/amd: Use 'unsigned int' to bare use of 'unsigned'<br><br>Change-Id: I05f9ea97ea80ac7a8f34845c59bd66e424ba2991<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/southbridge/amd/amd8111/ac97.c<br>M src/southbridge/amd/amd8111/acpi.c<br>M src/southbridge/amd/amd8111/amd8111_smbus.h<br>M src/southbridge/amd/amd8111/early_smbus.c<br>M src/southbridge/amd/amd8111/ide.c<br>M src/southbridge/amd/amd8111/lpc.c<br>M src/southbridge/amd/amd8111/nic.c<br>M src/southbridge/amd/amd8111/smbus.c<br>M src/southbridge/amd/amd8111/usb.c<br>M src/southbridge/amd/amd8111/usb2.c<br>M src/southbridge/amd/cs5536/cs5536.h<br>M src/southbridge/amd/cs5536/early_smbus.c<br>12 files changed, 44 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/28709/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/amd/amd8111/ac97.c b/src/southbridge/amd/amd8111/ac97.c</span><br><span>index ce5911f..9e458ea 100644</span><br><span>--- a/src/southbridge/amd/amd8111/ac97.c</span><br><span>+++ b/src/southbridge/amd/amd8111/ac97.c</span><br><span>@@ -20,8 +20,8 @@</span><br><span> #include <device/pci_ops.h></span><br><span> #include "amd8111.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                            unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x2c,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/amd8111/acpi.c b/src/southbridge/amd/amd8111/acpi.c</span><br><span>index 0948683..d2a9160 100644</span><br><span>--- a/src/southbridge/amd/amd8111/acpi.c</span><br><span>+++ b/src/southbridge/amd/amd8111/acpi.c</span><br><span>@@ -36,7 +36,7 @@</span><br><span> </span><br><span> static int lsmbus_recv_byte(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      unsigned device;</span><br><span style="color: hsl(120, 100%, 40%);">+      unsigned int device;</span><br><span>         struct resource *res;</span><br><span> </span><br><span>    device = dev->path.i2c.device;</span><br><span>@@ -47,7 +47,7 @@</span><br><span> </span><br><span> static int lsmbus_send_byte(struct device *dev, uint8_t val)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  unsigned device;</span><br><span style="color: hsl(120, 100%, 40%);">+      unsigned int device;</span><br><span>         struct resource *res;</span><br><span> </span><br><span>    device = dev->path.i2c.device;</span><br><span>@@ -59,7 +59,7 @@</span><br><span> </span><br><span> static int lsmbus_read_byte(struct device *dev, uint8_t address)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      unsigned device;</span><br><span style="color: hsl(120, 100%, 40%);">+      unsigned int device;</span><br><span>         struct resource *res;</span><br><span> </span><br><span>    device = dev->path.i2c.device;</span><br><span>@@ -70,7 +70,7 @@</span><br><span> </span><br><span> static int lsmbus_write_byte(struct device *dev, uint8_t address, uint8_t val)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        unsigned device;</span><br><span style="color: hsl(120, 100%, 40%);">+      unsigned int device;</span><br><span>         struct resource *res;</span><br><span> </span><br><span>    device = dev->path.i2c.device;</span><br><span>@@ -82,7 +82,7 @@</span><br><span> static int lsmbus_block_read(struct device *dev, uint8_t cmd, u8 bytes,</span><br><span>                          u8 *buffer)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   unsigned device;</span><br><span style="color: hsl(120, 100%, 40%);">+      unsigned int device;</span><br><span>         struct resource *res;</span><br><span> </span><br><span>    device = dev->path.i2c.device;</span><br><span>@@ -94,7 +94,7 @@</span><br><span> static int lsmbus_block_write(struct device *dev, uint8_t cmd, u8 bytes,</span><br><span>                          const u8 *buffer)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    unsigned device;</span><br><span style="color: hsl(120, 100%, 40%);">+      unsigned int device;</span><br><span>         struct resource *res;</span><br><span> </span><br><span>    device = dev->path.i2c.device;</span><br><span>@@ -217,8 +217,8 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                        unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x7c,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/amd8111/amd8111_smbus.h b/src/southbridge/amd/amd8111/amd8111_smbus.h</span><br><span>index 944c601..33856b3 100644</span><br><span>--- a/src/southbridge/amd/amd8111/amd8111_smbus.h</span><br><span>+++ b/src/southbridge/amd/amd8111/amd8111_smbus.h</span><br><span>@@ -63,7 +63,7 @@</span><br><span>   return loops?0:SMBUS_WAIT_UNTIL_DONE_TIMEOUT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int do_smbus_recv_byte(unsigned smbus_io_base, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static int do_smbus_recv_byte(unsigned smbus_io_base, unsigned int device)</span><br><span> {</span><br><span>        unsigned global_status_register;</span><br><span>     unsigned byte;</span><br><span>@@ -109,7 +109,8 @@</span><br><span>         return byte;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int do_smbus_send_byte(unsigned smbus_io_base, unsigned device, unsigned value)</span><br><span style="color: hsl(120, 100%, 40%);">+static int do_smbus_send_byte(unsigned smbus_io_base, unsigned int device,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned value)</span><br><span> {</span><br><span>   unsigned global_status_register;</span><br><span> </span><br><span>@@ -151,7 +152,8 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int do_smbus_read_byte(unsigned smbus_io_base, unsigned device, unsigned address)</span><br><span style="color: hsl(120, 100%, 40%);">+static int do_smbus_read_byte(unsigned smbus_io_base, unsigned int device,</span><br><span style="color: hsl(120, 100%, 40%);">+                         unsigned int address)</span><br><span> {</span><br><span>     unsigned global_status_register;</span><br><span>     unsigned byte;</span><br><span>@@ -197,7 +199,8 @@</span><br><span>         return byte;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int do_smbus_write_byte(unsigned smbus_io_base, unsigned device, unsigned address, unsigned char val)</span><br><span style="color: hsl(120, 100%, 40%);">+static int do_smbus_write_byte(unsigned smbus_io_base, unsigned int device,</span><br><span style="color: hsl(120, 100%, 40%);">+                               unsigned int address, unsigned char val)</span><br><span> {</span><br><span>         unsigned global_status_register;</span><br><span> </span><br><span>@@ -235,7 +238,8 @@</span><br><span>   return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int do_smbus_block_read(unsigned smbus_io_base, unsigned device, unsigned cmd, u8 bytes, u8 *buf)</span><br><span style="color: hsl(120, 100%, 40%);">+static int do_smbus_block_read(unsigned smbus_io_base, unsigned int device,</span><br><span style="color: hsl(120, 100%, 40%);">+                              unsigned cmd, u8 bytes, u8 *buf)</span><br><span> {</span><br><span>         unsigned global_status_register;</span><br><span>     unsigned i;</span><br><span>@@ -291,7 +295,8 @@</span><br><span>    return i;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int do_smbus_block_write(unsigned smbus_io_base, unsigned device, unsigned cmd, u8 bytes, const u8 *buf)</span><br><span style="color: hsl(120, 100%, 40%);">+static int do_smbus_block_write(unsigned smbus_io_base, unsigned int device,</span><br><span style="color: hsl(120, 100%, 40%);">+                               unsigned cmd, u8 bytes, const u8 *buf)</span><br><span> {</span><br><span>  unsigned global_status_register;</span><br><span>     unsigned i;</span><br><span>diff --git a/src/southbridge/amd/amd8111/early_smbus.c b/src/southbridge/amd/amd8111/early_smbus.c</span><br><span>index f2aa34c..4925c86 100644</span><br><span>--- a/src/southbridge/amd/amd8111/early_smbus.c</span><br><span>+++ b/src/southbridge/amd/amd8111/early_smbus.c</span><br><span>@@ -39,32 +39,35 @@</span><br><span>   printk(BIOS_SPEW, "SMBus controller enabled\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int smbus_recv_byte(unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int smbus_recv_byte(unsigned int device)</span><br><span> {</span><br><span>   return do_smbus_recv_byte(SMBUS_IO_BASE, device);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int smbus_send_byte(unsigned device, unsigned char val)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int smbus_send_byte(unsigned int device, unsigned char val)</span><br><span> {</span><br><span>      return do_smbus_send_byte(SMBUS_IO_BASE, device, val);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int smbus_read_byte(unsigned device, unsigned address)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int smbus_read_byte(unsigned int device, unsigned int address)</span><br><span> {</span><br><span>       return do_smbus_read_byte(SMBUS_IO_BASE, device, address);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int smbus_write_byte(unsigned device, unsigned address, unsigned char val)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int smbus_write_byte(unsigned int device, unsigned int address,</span><br><span style="color: hsl(120, 100%, 40%);">+                               unsigned char val)</span><br><span> {</span><br><span>   return do_smbus_write_byte(SMBUS_IO_BASE, device, address, val);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int smbus_block_read(unsigned device, unsigned cmd, u8 bytes, u8 *buf)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int smbus_block_read(unsigned int device, unsigned cmd, u8 bytes,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   u8 *buf)</span><br><span> {</span><br><span>     return do_smbus_block_read(SMBUS_IO_BASE, device, cmd, bytes, buf);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline int smbus_block_write(unsigned device, unsigned cmd, u8 bytes, const u8 *buf)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int smbus_block_write(unsigned int device, unsigned cmd, u8 bytes,</span><br><span style="color: hsl(120, 100%, 40%);">+                                 const u8 *buf)</span><br><span> {</span><br><span>      return do_smbus_block_write(SMBUS_IO_BASE, device, cmd, bytes, buf);</span><br><span> }</span><br><span>diff --git a/src/southbridge/amd/amd8111/ide.c b/src/southbridge/amd/amd8111/ide.c</span><br><span>index 9b6577a..420e28e 100644</span><br><span>--- a/src/southbridge/amd/amd8111/ide.c</span><br><span>+++ b/src/southbridge/amd/amd8111/ide.c</span><br><span>@@ -53,8 +53,8 @@</span><br><span>       pci_write_config16(dev, 0x42, word);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                               unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x70,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/amd8111/lpc.c b/src/southbridge/amd/amd8111/lpc.c</span><br><span>index 53dbf98..eab885d 100644</span><br><span>--- a/src/southbridge/amd/amd8111/lpc.c</span><br><span>+++ b/src/southbridge/amd/amd8111/lpc.c</span><br><span>@@ -124,8 +124,8 @@</span><br><span>         res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                           unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x70,</span><br><span>                           ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/amd8111/nic.c b/src/southbridge/amd/amd8111/nic.c</span><br><span>index edfc584..30601fd 100644</span><br><span>--- a/src/southbridge/amd/amd8111/nic.c</span><br><span>+++ b/src/southbridge/amd/amd8111/nic.c</span><br><span>@@ -75,8 +75,8 @@</span><br><span>        printk(BIOS_DEBUG, "Done\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                            unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0xc8,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/amd8111/smbus.c b/src/southbridge/amd/amd8111/smbus.c</span><br><span>index 5ff17b8..375234e 100644</span><br><span>--- a/src/southbridge/amd/amd8111/smbus.c</span><br><span>+++ b/src/southbridge/amd/amd8111/smbus.c</span><br><span>@@ -23,8 +23,8 @@</span><br><span> #include "amd8111.h"</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                        unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x44,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/amd8111/usb.c b/src/southbridge/amd/amd8111/usb.c</span><br><span>index 62e4111..0b5a038 100644</span><br><span>--- a/src/southbridge/amd/amd8111/usb.c</span><br><span>+++ b/src/southbridge/amd/amd8111/usb.c</span><br><span>@@ -22,8 +22,8 @@</span><br><span> #include "amd8111.h"</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                        unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x70,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/amd8111/usb2.c b/src/southbridge/amd/amd8111/usb2.c</span><br><span>index be25609..5d0d663 100644</span><br><span>--- a/src/southbridge/amd/amd8111/usb2.c</span><br><span>+++ b/src/southbridge/amd/amd8111/usb2.c</span><br><span>@@ -23,8 +23,8 @@</span><br><span> </span><br><span> #if 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(struct device *dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">-                             unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+                             unsigned int device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x70,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/amd/cs5536/cs5536.h b/src/southbridge/amd/cs5536/cs5536.h</span><br><span>index 4083f4f..06c504a 100644</span><br><span>--- a/src/southbridge/amd/cs5536/cs5536.h</span><br><span>+++ b/src/southbridge/amd/cs5536/cs5536.h</span><br><span>@@ -445,7 +445,7 @@</span><br><span> void cs5536_early_setup(void);</span><br><span> </span><br><span> void cs5536_enable_smbus(void);</span><br><span style="color: hsl(0, 100%, 40%);">-int smbus_read_byte(unsigned device, unsigned address);</span><br><span style="color: hsl(120, 100%, 40%);">+int smbus_read_byte(unsigned int device, unsigned int address);</span><br><span> #else</span><br><span> void chipsetinit(void);</span><br><span> #endif</span><br><span>diff --git a/src/southbridge/amd/cs5536/early_smbus.c b/src/southbridge/amd/cs5536/early_smbus.c</span><br><span>index ed2b942..a1cf50b 100644</span><br><span>--- a/src/southbridge/amd/cs5536/early_smbus.c</span><br><span>+++ b/src/southbridge/amd/cs5536/early_smbus.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int smbus_read_byte(unsigned device, unsigned address)</span><br><span style="color: hsl(120, 100%, 40%);">+int smbus_read_byte(unsigned int device, unsigned int address)</span><br><span> {</span><br><span>         return do_smbus_read_byte(SMBUS_IO_BASE, device, address);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28709">change 28709</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28709"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I05f9ea97ea80ac7a8f34845c59bd66e424ba2991 </div>
<div style="display:none"> Gerrit-Change-Number: 28709 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>