sb/amd: Use 'unsigned int' to bare use of 'unsigned'

Change-Id: I05f9ea97ea80ac7a8f34845c59bd66e424ba2991
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/28709
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Elyes HAOUAS 2018-09-21 11:42:09 +02:00 committed by Patrick Georgi
parent 17ad4598e9
commit 78d338ccb9
12 changed files with 44 additions and 36 deletions

View File

@ -20,8 +20,8 @@
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include "amd8111.h" #include "amd8111.h"
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0x2c, pci_write_config32(dev, 0x2c,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -36,7 +36,7 @@
static int lsmbus_recv_byte(struct device *dev) static int lsmbus_recv_byte(struct device *dev)
{ {
unsigned device; unsigned int device;
struct resource *res; struct resource *res;
device = dev->path.i2c.device; device = dev->path.i2c.device;
@ -47,7 +47,7 @@ static int lsmbus_recv_byte(struct device *dev)
static int lsmbus_send_byte(struct device *dev, uint8_t val) static int lsmbus_send_byte(struct device *dev, uint8_t val)
{ {
unsigned device; unsigned int device;
struct resource *res; struct resource *res;
device = dev->path.i2c.device; device = dev->path.i2c.device;
@ -59,7 +59,7 @@ static int lsmbus_send_byte(struct device *dev, uint8_t val)
static int lsmbus_read_byte(struct device *dev, uint8_t address) static int lsmbus_read_byte(struct device *dev, uint8_t address)
{ {
unsigned device; unsigned int device;
struct resource *res; struct resource *res;
device = dev->path.i2c.device; device = dev->path.i2c.device;
@ -70,7 +70,7 @@ static int lsmbus_read_byte(struct device *dev, uint8_t address)
static int lsmbus_write_byte(struct device *dev, uint8_t address, uint8_t val) static int lsmbus_write_byte(struct device *dev, uint8_t address, uint8_t val)
{ {
unsigned device; unsigned int device;
struct resource *res; struct resource *res;
device = dev->path.i2c.device; device = dev->path.i2c.device;
@ -82,7 +82,7 @@ static int lsmbus_write_byte(struct device *dev, uint8_t address, uint8_t val)
static int lsmbus_block_read(struct device *dev, uint8_t cmd, u8 bytes, static int lsmbus_block_read(struct device *dev, uint8_t cmd, u8 bytes,
u8 *buffer) u8 *buffer)
{ {
unsigned device; unsigned int device;
struct resource *res; struct resource *res;
device = dev->path.i2c.device; device = dev->path.i2c.device;
@ -94,7 +94,7 @@ static int lsmbus_block_read(struct device *dev, uint8_t cmd, u8 bytes,
static int lsmbus_block_write(struct device *dev, uint8_t cmd, u8 bytes, static int lsmbus_block_write(struct device *dev, uint8_t cmd, u8 bytes,
const u8 *buffer) const u8 *buffer)
{ {
unsigned device; unsigned int device;
struct resource *res; struct resource *res;
device = dev->path.i2c.device; device = dev->path.i2c.device;
@ -217,8 +217,8 @@ static void acpi_enable_resources(struct device *dev)
} }
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0x7c, pci_write_config32(dev, 0x7c,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -63,7 +63,7 @@ static int smbus_wait_until_done(unsigned smbus_io_base)
return loops?0:SMBUS_WAIT_UNTIL_DONE_TIMEOUT; return loops?0:SMBUS_WAIT_UNTIL_DONE_TIMEOUT;
} }
static int do_smbus_recv_byte(unsigned smbus_io_base, unsigned device) static int do_smbus_recv_byte(unsigned smbus_io_base, unsigned int device)
{ {
unsigned global_status_register; unsigned global_status_register;
unsigned byte; unsigned byte;
@ -109,7 +109,8 @@ static int do_smbus_recv_byte(unsigned smbus_io_base, unsigned device)
return byte; return byte;
} }
static int do_smbus_send_byte(unsigned smbus_io_base, unsigned device, unsigned value) static int do_smbus_send_byte(unsigned smbus_io_base, unsigned int device,
unsigned value)
{ {
unsigned global_status_register; unsigned global_status_register;
@ -151,7 +152,8 @@ static int do_smbus_send_byte(unsigned smbus_io_base, unsigned device, unsigned
} }
static int do_smbus_read_byte(unsigned smbus_io_base, unsigned device, unsigned address) static int do_smbus_read_byte(unsigned smbus_io_base, unsigned int device,
unsigned int address)
{ {
unsigned global_status_register; unsigned global_status_register;
unsigned byte; unsigned byte;
@ -197,7 +199,8 @@ static int do_smbus_read_byte(unsigned smbus_io_base, unsigned device, unsigned
return byte; return byte;
} }
static int do_smbus_write_byte(unsigned smbus_io_base, unsigned device, unsigned address, unsigned char val) static int do_smbus_write_byte(unsigned smbus_io_base, unsigned int device,
unsigned int address, unsigned char val)
{ {
unsigned global_status_register; unsigned global_status_register;
@ -235,7 +238,8 @@ static int do_smbus_write_byte(unsigned smbus_io_base, unsigned device, unsigned
return 0; return 0;
} }
static int do_smbus_block_read(unsigned smbus_io_base, unsigned device, unsigned cmd, u8 bytes, u8 *buf) static int do_smbus_block_read(unsigned smbus_io_base, unsigned int device,
unsigned cmd, u8 bytes, u8 *buf)
{ {
unsigned global_status_register; unsigned global_status_register;
unsigned i; unsigned i;
@ -291,7 +295,8 @@ static int do_smbus_block_read(unsigned smbus_io_base, unsigned device, unsigned
return i; return i;
} }
static int do_smbus_block_write(unsigned smbus_io_base, unsigned device, unsigned cmd, u8 bytes, const u8 *buf) static int do_smbus_block_write(unsigned smbus_io_base, unsigned int device,
unsigned cmd, u8 bytes, const u8 *buf)
{ {
unsigned global_status_register; unsigned global_status_register;
unsigned i; unsigned i;

View File

@ -39,32 +39,35 @@ static void enable_smbus(void)
printk(BIOS_SPEW, "SMBus controller enabled\n"); printk(BIOS_SPEW, "SMBus controller enabled\n");
} }
static inline int smbus_recv_byte(unsigned device) static inline int smbus_recv_byte(unsigned int device)
{ {
return do_smbus_recv_byte(SMBUS_IO_BASE, device); return do_smbus_recv_byte(SMBUS_IO_BASE, device);
} }
static inline int smbus_send_byte(unsigned device, unsigned char val) static inline int smbus_send_byte(unsigned int device, unsigned char val)
{ {
return do_smbus_send_byte(SMBUS_IO_BASE, device, val); return do_smbus_send_byte(SMBUS_IO_BASE, device, val);
} }
static inline int smbus_read_byte(unsigned device, unsigned address) static inline int smbus_read_byte(unsigned int device, unsigned int address)
{ {
return do_smbus_read_byte(SMBUS_IO_BASE, device, address); return do_smbus_read_byte(SMBUS_IO_BASE, device, address);
} }
static inline int smbus_write_byte(unsigned device, unsigned address, unsigned char val) static inline int smbus_write_byte(unsigned int device, unsigned int address,
unsigned char val)
{ {
return do_smbus_write_byte(SMBUS_IO_BASE, device, address, val); return do_smbus_write_byte(SMBUS_IO_BASE, device, address, val);
} }
static inline int smbus_block_read(unsigned device, unsigned cmd, u8 bytes, u8 *buf) static inline int smbus_block_read(unsigned int device, unsigned cmd, u8 bytes,
u8 *buf)
{ {
return do_smbus_block_read(SMBUS_IO_BASE, device, cmd, bytes, buf); return do_smbus_block_read(SMBUS_IO_BASE, device, cmd, bytes, buf);
} }
static inline int smbus_block_write(unsigned device, unsigned cmd, u8 bytes, const u8 *buf) static inline int smbus_block_write(unsigned int device, unsigned cmd, u8 bytes,
const u8 *buf)
{ {
return do_smbus_block_write(SMBUS_IO_BASE, device, cmd, bytes, buf); return do_smbus_block_write(SMBUS_IO_BASE, device, cmd, bytes, buf);
} }

View File

@ -53,8 +53,8 @@ static void ide_init(struct device *dev)
pci_write_config16(dev, 0x42, word); pci_write_config16(dev, 0x42, word);
} }
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0x70, pci_write_config32(dev, 0x70,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -124,8 +124,8 @@ static void amd8111_lpc_read_resources(struct device *dev)
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
} }
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0x70, pci_write_config32(dev, 0x70,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -75,8 +75,8 @@ static void nic_init(struct device *dev)
printk(BIOS_DEBUG, "Done\n"); printk(BIOS_DEBUG, "Done\n");
} }
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0xc8, pci_write_config32(dev, 0xc8,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -23,8 +23,8 @@
#include "amd8111.h" #include "amd8111.h"
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0x44, pci_write_config32(dev, 0x44,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -22,8 +22,8 @@
#include "amd8111.h" #include "amd8111.h"
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0x70, pci_write_config32(dev, 0x70,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -23,8 +23,8 @@
#if 0 #if 0
static void lpci_set_subsystem(struct device *dev, unsigned vendor, static void lpci_set_subsystem(struct device *dev, unsigned int vendor,
unsigned device) unsigned int device)
{ {
pci_write_config32(dev, 0x70, pci_write_config32(dev, 0x70,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));

View File

@ -445,7 +445,7 @@ void cs5536_disable_internal_uart(void);
void cs5536_early_setup(void); void cs5536_early_setup(void);
void cs5536_enable_smbus(void); void cs5536_enable_smbus(void);
int smbus_read_byte(unsigned device, unsigned address); int smbus_read_byte(unsigned int device, unsigned int address);
#else #else
void chipsetinit(void); void chipsetinit(void);
#endif #endif

View File

@ -33,7 +33,7 @@ void cs5536_enable_smbus(void)
} }
int smbus_read_byte(unsigned device, unsigned address) int smbus_read_byte(unsigned int device, unsigned int address)
{ {
return do_smbus_read_byte(SMBUS_IO_BASE, device, address); return do_smbus_read_byte(SMBUS_IO_BASE, device, address);
} }