diff --git a/device/device.c b/device/device.c
index 7d7ccf717d..b6bc87bff0 100644
--- a/device/device.c
+++ b/device/device.c
@@ -166,6 +166,7 @@ struct device *constructor(struct device_id *id)
  *
  * @param parent Parent bus the newly created device is attached to.
  * @param path Path to the device to be created.
+ * @param devid TODO
  * @return Pointer to the newly created device structure.
  * @see device_path
  */
@@ -739,7 +740,7 @@ void dev_phase2(void)
  * bridges. If the setting up and tuning of the bus causes a reset to be
  * required, reset the bus and scan it again.
  *
- * @param bus Pointer to the bus device.
+ * @param busdevice Pointer to the bus device.
  * @param max Current bus number.
  * @return The maximum bus number found, after scanning all subordinate buses.
  */
diff --git a/device/pci_device.c b/device/pci_device.c
index 1b4fae6058..e0920715e3 100644
--- a/device/pci_device.c
+++ b/device/pci_device.c
@@ -150,7 +150,6 @@ unsigned int pci_find_capability(struct device *dev, unsigned int cap)
  * Given a device and register, read the size of the BAR for that register. 
  *
  * @param dev Pointer to the device structure.
- * @param resource Pointer to the resource structure.
  * @param index Address of the PCI configuration register.
  */
 struct resource *pci_get_resource(struct device *dev, unsigned long index)
diff --git a/southbridge/amd/cs5536/smbus_initram.c b/southbridge/amd/cs5536/smbus_initram.c
index cacac99d97..1dcc134b3c 100644
--- a/southbridge/amd/cs5536/smbus_initram.c
+++ b/southbridge/amd/cs5536/smbus_initram.c
@@ -249,7 +249,7 @@ static u8 smbus_get_result(u16 smbus_io_base)
  *
  * @param smbus_io_base The SMBus I/O base.
  * @param device The device.
- * @param command The command.
+ * @param address The address.
  * @return The data from the SMBus packet area.
  */
 static u8 do_smbus_read_byte(u16 smbus_io_base, u8 device, u8 address)
@@ -315,7 +315,7 @@ err:
  * one thing -- calling this function to read DRAM parameters.
  *
  * @param device The device.
- * @param command The command.
+ * @param address The address.
  * @return The data from the SMBus packet area or an error of 0xff (i.e. -1).
  */
 int smbus_read_byte(u16 device, u8 address)
diff --git a/util/x86emu/pcbios/pcibios.h b/util/x86emu/pcbios/pcibios.h
index 224d3c698b..c0bbbe91ac 100644
--- a/util/x86emu/pcbios/pcibios.h
+++ b/util/x86emu/pcbios/pcibios.h
@@ -34,7 +34,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */#ifndef PCI_BIOS_H
+ */
+
+#ifndef PCI_BIOS_H
 #define PCI_BIOS_H
 
 enum {