4 files changed, 42 insertions, 41 deletions
diff --git a/src/include/device/pciexp.h b/src/include/device/pciexp.h
index becc800934..409f211a82 100644
--- a/src/include/device/pciexp.h
+++ b/src/include/device/pciexp.h
@@ -2,8 +2,8 @@
 #define DEVICE_PCIEXP_H
 /* (c) 2005 Linux Networx GPL see COPYING for details */
 
-unsigned int pciexp_scan_bus(struct bus *bus,
-	unsigned min_devfn, unsigned max_devfn, unsigned int max);
+unsigned int pciexp_scan_bus(struct bus *bus, unsigned int min_devfn,
+			     unsigned int max_devfn, unsigned int max);
 unsigned int pciexp_scan_bridge(device_t dev, unsigned int max);
 
 extern struct device_operations default_pciexp_ops_bus;
diff --git a/src/include/device/pcix.h b/src/include/device/pcix.h
index e017922ef1..4ffab5bba7 100644
--- a/src/include/device/pcix.h
+++ b/src/include/device/pcix.h
@@ -2,10 +2,10 @@
 #define DEVICE_PCIX_H
 /* (c) 2005 Linux Networx GPL see COPYING for details */
 
-unsigned int pcix_scan_bus(struct bus *bus,
-	unsigned min_devfn, unsigned max_devfn, unsigned int max);
+unsigned int pcix_scan_bus(struct bus *bus, unsigned int min_devfn,
+			   unsigned int max_devfn, unsigned int max);
 unsigned int pcix_scan_bridge(device_t dev, unsigned int max);
-const char *pcix_speed(unsigned sstatus);
+const char *pcix_speed(u16 sstatus);
 
 extern struct device_operations default_pcix_ops_bus;
 
diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h
index 32e9c5eada..9e94a0c5b0 100644
--- a/src/include/device/pnp.h
+++ b/src/include/device/pnp.h
@@ -5,15 +5,15 @@
 #include <device/device.h>
 #include <device/pnp_def.h>
 
-/* Primitive pnp resource manipulation */
-void    pnp_write_config(device_t dev, uint8_t reg, uint8_t value);
-uint8_t pnp_read_config(device_t dev, uint8_t reg);
-void    pnp_set_logical_device(device_t dev);
-void    pnp_set_enable(device_t dev, int enable);
-int     pnp_read_enable(device_t dev);
-void    pnp_set_iobase(device_t dev, unsigned index, unsigned iobase);
-void    pnp_set_irq(device_t dev, unsigned index, unsigned irq);
-void    pnp_set_drq(device_t dev, unsigned index, unsigned drq);
+/* Primitive PNP resource manipulation */
+void pnp_write_config(device_t dev, u8 reg, u8 value);
+u8 pnp_read_config(device_t dev, u8 reg);
+void pnp_set_logical_device(device_t dev);
+void pnp_set_enable(device_t dev, int enable);
+int pnp_read_enable(device_t dev);
+void pnp_set_iobase(device_t dev, u8 index, u16 iobase);
+void pnp_set_irq(device_t dev, u8 index, u8 irq);
+void pnp_set_drq(device_t dev, u8 index, u8 drq);
 
 /* PNP device operations */
 void pnp_read_resources(device_t dev);
@@ -31,8 +31,8 @@ struct io_info {
 
 struct pnp_info {
 	struct device_operations *ops;
-	unsigned function;
-	unsigned flags;
+	unsigned int function;
+	unsigned int flags;
 #define PNP_IO0  0x001
 #define PNP_IO1  0x002
 #define PNP_IO2  0x004
@@ -48,6 +48,6 @@ struct pnp_info {
 };
 struct resource *pnp_get_resource(device_t dev, unsigned index);
 void pnp_enable_devices(struct device *dev, struct device_operations *ops,
-	unsigned functions, struct pnp_info *info);
+			unsigned int functions, struct pnp_info *info);
 
 #endif /* DEVICE_PNP_H */
diff --git a/src/include/device/smbus.h b/src/include/device/smbus.h
index 148c4d7785..073d7e2c99 100644
--- a/src/include/device/smbus.h
+++ b/src/include/device/smbus.h
@@ -6,44 +6,45 @@
 #include <device/path.h>
 #include <device/smbus_def.h>
 
-/* Common smbus bus operations */
+/* Common SMBus bus operations */
 struct smbus_bus_operations {
 	int (*quick_read)  (device_t dev);
 	int (*quick_write) (device_t dev);
 	int (*recv_byte)   (device_t dev);
-	int (*send_byte)   (device_t dev, uint8_t value);
-	int (*read_byte)   (device_t dev, uint8_t addr);
-	int (*write_byte)  (device_t dev, uint8_t addr, uint8_t value);
-	int (*read_word)   (device_t dev, uint8_t addr);
-	int (*write_word)  (device_t dev, uint8_t addr, uint16_t value);
-	int (*process_call)(device_t dev, uint8_t cmd, uint16_t data);
-	int (*block_read)  (device_t dev, uint8_t cmd, uint8_t bytes, uint8_t *buffer);
-	int (*block_write) (device_t dev, uint8_t cmd, uint8_t bytes, const uint8_t *buffer);
+	int (*send_byte)   (device_t dev, u8 value);
+	int (*read_byte)   (device_t dev, u8 addr);
+	int (*write_byte)  (device_t dev, u8 addr, u8 value);
+	int (*read_word)   (device_t dev, u8 addr);
+	int (*write_word)  (device_t dev, u8 addr, u16 value);
+	int (*process_call)(device_t dev, u8 cmd, u16 data);
+	int (*block_read)  (device_t dev, u8 cmd, u8 bytes, u8 *buffer);
+	int (*block_write) (device_t dev, u8 cmd, u8 bytes, const u8 *buffer);
 };
 
 static inline const struct smbus_bus_operations *ops_smbus_bus(struct bus *bus)
 {
-        const struct smbus_bus_operations *bops;
-        bops = 0;
-        if (bus && bus->dev && bus->dev->ops) {
-                bops = bus->dev->ops->ops_smbus_bus;
-        }
-        return bops;
+	const struct smbus_bus_operations *bops;
+
+	bops = 0;
+	if (bus && bus->dev && bus->dev->ops)
+		bops = bus->dev->ops->ops_smbus_bus;
+
+	return bops;
 }
+
 struct bus *get_pbus_smbus(device_t dev);
 int smbus_set_link(device_t dev);
 
 int smbus_quick_read(device_t dev);
 int smbus_quick_write(device_t dev);
 int smbus_recv_byte(device_t dev);
-int smbus_send_byte(device_t dev, uint8_t byte);
-int smbus_read_byte(device_t dev, uint8_t addr);
-int smbus_write_byte(device_t dev, uint8_t addr, uint8_t val);
-int smbus_read_word(device_t dev, uint8_t addr);
-int smbus_write_word(device_t dev, uint8_t addr, uint16_t val);
-int smbus_process_call(device_t dev, uint8_t cmd, uint16_t data);
-int smbus_block_read(device_t dev, uint8_t cmd, uint8_t bytes, uint8_t *buffer);
-int smbus_block_write(device_t dev, uint8_t cmd, uint8_t bytes, const uint8_t *buffer);
-
+int smbus_send_byte(device_t dev, u8 byte);
+int smbus_read_byte(device_t dev, u8 addr);
+int smbus_write_byte(device_t dev, u8 addr, u8 val);
+int smbus_read_word(device_t dev, u8 addr);
+int smbus_write_word(device_t dev, u8 addr, u16 val);
+int smbus_process_call(device_t dev, u8 cmd, u16 data);
+int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer);
+int smbus_block_write(device_t dev, u8 cmd, u8 bytes, const u8 *buffer);
 
 #endif /* DEVICE_SMBUS_H */