diff --git a/src/drivers/aspeed/ast2050/ast2050.c b/src/drivers/aspeed/ast2050/ast2050.c
index 59d3f0bfee..ed128f319b 100644
--- a/src/drivers/aspeed/ast2050/ast2050.c
+++ b/src/drivers/aspeed/ast2050/ast2050.c
@@ -73,7 +73,7 @@ static struct device_operations aspeed_ast2050_ops  = {
 };
 
 static const struct pci_driver aspeed_ast2050_driver __pci_driver = {
-        .ops    = &aspeed_ast2050_ops,
-        .vendor = PCI_VENDOR_ID_ASPEED,
-        .device = PCI_DEVICE_ID_ASPEED_AST2050_VGA,
+	.ops    = &aspeed_ast2050_ops,
+	.vendor = PCI_VENDOR_ID_ASPEED,
+	.device = PCI_DEVICE_ID_ASPEED_AST2050_VGA,
 };
diff --git a/src/drivers/ati/ragexl/fb.h b/src/drivers/ati/ragexl/fb.h
index f112d0e575..8daf7ba34d 100644
--- a/src/drivers/ati/ragexl/fb.h
+++ b/src/drivers/ati/ragexl/fb.h
@@ -12,7 +12,7 @@
 #define FB_MAX			32	/* sufficient for now */
 
 /* ioctls
-   0x46 is 'F'								*/
+ * 0x46 is 'F'								*/
 #define FBIOGET_VSCREENINFO	0x4600
 #define FBIOPUT_VSCREENINFO	0x4601
 #define FBIOGET_FSCREENINFO	0x4602
@@ -271,9 +271,9 @@ struct fb_vblank {
 
 
 
-   /*
-    *    Hardware Cursor
-    */
+/*
+ *    Hardware Cursor
+ */
 
 #define FBIOGET_FCURSORINFO     0x4607
 #define FBIOGET_VCURSORINFO     0x4608
@@ -307,38 +307,38 @@ struct fb_cursorstate {
 
 
 struct fb_info {
-   char modename[40];                   /* default video mode */
+	char modename[40];                   /* default video mode */
 //   kdev_t node;
-   int flags;
-   int open;                            /* Has this been open already ? */
-   struct fb_var_screeninfo var;        /* Current var */
+	int flags;
+	int open;                            /* Has this been open already ? */
+	struct fb_var_screeninfo var;        /* Current var */
 #if 0
-   struct fb_fix_screeninfo fix;        /* Current fix */
+	struct fb_fix_screeninfo fix;        /* Current fix */
 #endif
-   struct fb_monspecs monspecs;         /* Current Monitor specs */
-   struct fb_cmap cmap;                 /* Current cmap */
+	struct fb_monspecs monspecs;         /* Current Monitor specs */
+	struct fb_cmap cmap;                 /* Current cmap */
 //   struct fb_ops *fbops;
-   char *screen_base;                   /* Virtual address */
-   struct display *disp;                /* initial display variable */
+	char *screen_base;                   /* Virtual address */
+	struct display *disp;                /* initial display variable */
 //   struct vc_data *display_fg;          /* Console visible on this display */
-   char fontname[40];                   /* default font name */
+	char fontname[40];                   /* default font name */
 #if 0
-   devfs_handle_t devfs_handle;         /* Devfs handle for new name         */
-   devfs_handle_t devfs_lhandle;        /* Devfs handle for compat. symlink  */
-   int (*changevar)(int);               /* tell console var has changed */
-   int (*switch_con)(int, struct fb_info*);
+	devfs_handle_t devfs_handle;         /* Devfs handle for new name         */
+	devfs_handle_t devfs_lhandle;        /* Devfs handle for compat. symlink  */
+	int (*changevar)(int);               /* tell console var has changed */
+	int (*switch_con)(int, struct fb_info*);
                                         /* tell fb to switch consoles */
-   int (*updatevar)(int, struct fb_info*);
+	int (*updatevar)(int, struct fb_info*);
                                         /* tell fb to update the vars */
-   void (*blank)(int, struct fb_info*); /* tell fb to (un)blank the screen */
+	void (*blank)(int, struct fb_info*); /* tell fb to (un)blank the screen */
                                         /* arg = 0: unblank */
                                         /* arg > 0: VESA level (arg-1) */
 #endif
-   void *pseudo_palette;                /* Fake palette of 16 colors and
+	void *pseudo_palette;                /* Fake palette of 16 colors and
                                            the cursor's color for non
                                            palette mode */
-   /* From here on everything is device dependent */
-   void *par;
+/* From here on everything is device dependent */
+	void *par;
 };
 
 #endif /* _LINUX_FB_H */
diff --git a/src/drivers/ati/ragexl/mach64.h b/src/drivers/ati/ragexl/mach64.h
index 354ae2ba0d..7400b43870 100644
--- a/src/drivers/ati/ragexl/mach64.h
+++ b/src/drivers/ati/ragexl/mach64.h
@@ -858,8 +858,8 @@
 #define GL_CHIP_ID	0x474c	/* RAGE XL, PQFP, PCI66 */
 
 #define IS_XL(id) ((id)==GR_CHIP_ID || (id)==GS_CHIP_ID || \
-                   (id)==GM_CHIP_ID || (id)==GN_CHIP_ID || \
-                   (id)==GO_CHIP_ID || (id)==GL_CHIP_ID)
+		   (id)==GM_CHIP_ID || (id)==GN_CHIP_ID || \
+		   (id)==GO_CHIP_ID || (id)==GL_CHIP_ID)
 
 #define GT_CHIP_ID	0x4754	/* RAGE (GT) */
 #define GU_CHIP_ID	0x4755	/* RAGE II/II+ (GTB) */
diff --git a/src/drivers/i2c/rtd2132/rtd2132.c b/src/drivers/i2c/rtd2132/rtd2132.c
index a4c2756c1a..2aaa234d78 100644
--- a/src/drivers/i2c/rtd2132/rtd2132.c
+++ b/src/drivers/i2c/rtd2132/rtd2132.c
@@ -149,7 +149,7 @@ static void rtd2132_sscg(struct device *dev, struct drivers_i2c_rtd2132_config *
 }
 
 static void rtd2132_lvds_swap(struct device *dev,
-                              struct drivers_i2c_rtd2132_config *cfg)
+			      struct drivers_i2c_rtd2132_config *cfg)
 {
 	u8 swap_value = RTD2132_LVDS_SWAP_NORMAL;
 
diff --git a/src/drivers/ics/954309/ics954309.c b/src/drivers/ics/954309/ics954309.c
index 59116090a4..a3d1d810af 100644
--- a/src/drivers/ics/954309/ics954309.c
+++ b/src/drivers/ics/954309/ics954309.c
@@ -51,10 +51,10 @@ static void ics954309_init(struct device *dev)
 }
 
 static struct device_operations ics954309_operations = {
-        .read_resources   = DEVICE_NOOP,
-        .set_resources    = DEVICE_NOOP,
-        .enable_resources = DEVICE_NOOP,
-        .init             = ics954309_init,
+	.read_resources   = DEVICE_NOOP,
+	.set_resources    = DEVICE_NOOP,
+	.enable_resources = DEVICE_NOOP,
+	.init             = ics954309_init,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/drivers/intel/gma/i915.h b/src/drivers/intel/gma/i915.h
index 6f2b8eaa3c..a4ae3069fa 100644
--- a/src/drivers/intel/gma/i915.h
+++ b/src/drivers/intel/gma/i915.h
@@ -56,10 +56,10 @@ enum pipe {
 };
 
 enum transcoder {
-        TRANSCODER_A = 0,
-        TRANSCODER_B,
-        TRANSCODER_C,
-        TRANSCODER_EDP = 0xF,
+	TRANSCODER_A = 0,
+	TRANSCODER_B,
+	TRANSCODER_C,
+	TRANSCODER_EDP = 0xF,
 };
 
 enum plane {
diff --git a/src/drivers/ipmi/ipmi_kcs.c b/src/drivers/ipmi/ipmi_kcs.c
index e6d2e0bd7f..5ed46fe9fc 100644
--- a/src/drivers/ipmi/ipmi_kcs.c
+++ b/src/drivers/ipmi/ipmi_kcs.c
@@ -85,7 +85,7 @@ static int ipmi_kcs_send_data_byte(int port, const unsigned char byte)
 	if (wait_ibf_timeout(port))
 		return 1;
 
-        status = ipmi_kcs_status(port);
+	status = ipmi_kcs_status(port);
 	if ((status & IPMI_KCS_OBF) &&
 	    IPMI_KCS_STATE(status) != IPMI_KCS_STATE_WRITE) {
 		printk(BIOS_ERR, "%s: status %02x\n", __func__, status);
@@ -106,7 +106,7 @@ static int ipmi_kcs_send_last_data_byte(int port, const unsigned char byte)
 	if (wait_ibf_timeout(port))
 		return 1;
 
-        status = ipmi_kcs_status(port);
+	status = ipmi_kcs_status(port);
 	if ((status & IPMI_KCS_OBF) &&
 	    IPMI_KCS_STATE(status) != IPMI_KCS_STATE_WRITE) {
 		printk(BIOS_ERR, "%s: status %02x\n", __func__, status);
diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c
index ed56006ec4..bec1d78fc2 100644
--- a/src/drivers/net/ne2k.c
+++ b/src/drivers/net/ne2k.c
@@ -450,9 +450,9 @@ static struct device_operations ne2k_ops  = {
 };
 
 static const struct pci_driver ne2k_driver __pci_driver = {
-        .ops    = &ne2k_ops,
-        .vendor = 0x10ec,
-        .device = 0x8029,
+	.ops    = &ne2k_ops,
+	.vendor = 0x10ec,
+	.device = 0x8029,
 };
 
 #endif /* __PRE_RAM__ */
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index f58a7350c5..3727ccdd0f 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -230,15 +230,15 @@ static void r8168_init(struct device *dev)
 }
 
 static struct device_operations r8168_ops  = {
-       .read_resources   = pci_dev_read_resources,
-       .set_resources    = pci_dev_set_resources,
-       .enable_resources = pci_dev_enable_resources,
-       .init             = r8168_init,
-       .scan_bus         = 0,
+	.read_resources   = pci_dev_read_resources,
+	.set_resources    = pci_dev_set_resources,
+	.enable_resources = pci_dev_enable_resources,
+	.init             = r8168_init,
+	.scan_bus         = 0,
 };
 
 static const struct pci_driver r8168_driver __pci_driver = {
-        .ops    = &r8168_ops,
-        .vendor = 0x10ec,
-        .device = 0x8168,
+	.ops    = &r8168_ops,
+	.vendor = 0x10ec,
+	.device = 0x8168,
 };
diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tpm.c
index 0fdf548868..e9730a99c5 100644
--- a/src/drivers/pc80/tpm/tpm.c
+++ b/src/drivers/pc80/tpm/tpm.c
@@ -58,7 +58,7 @@
 
 /* the macro accepts the locality value, but only locality 0 is operational */
 #define TIS_REG(LOCALITY, REG) \
-    (void *)(CONFIG_TPM_TIS_BASE_ADDRESS + (LOCALITY << 12) + REG)
+	(void *)(CONFIG_TPM_TIS_BASE_ADDRESS + (LOCALITY << 12) + REG)
 
 /* hardware registers' offsets */
 #define TIS_REG_ACCESS                 0x0
diff --git a/src/drivers/pc80/vga/vga.h b/src/drivers/pc80/vga/vga.h
index 1e6e750b89..a6fb2b4886 100644
--- a/src/drivers/pc80/vga/vga.h
+++ b/src/drivers/pc80/vga/vga.h
@@ -5,9 +5,9 @@
  * Basic palette.
  */
 struct palette {
-        unsigned char red;
-        unsigned char green;
-        unsigned char blue;
+	unsigned char red;
+	unsigned char green;
+	unsigned char blue;
 };
 
 extern const struct palette default_vga_palette[0x100];
diff --git a/src/drivers/sil/3114/sil_sata.c b/src/drivers/sil/3114/sil_sata.c
index 2510fa95d9..3c56266cbf 100644
--- a/src/drivers/sil/3114/sil_sata.c
+++ b/src/drivers/sil/3114/sil_sata.c
@@ -51,9 +51,9 @@ static struct device_operations si_sata_ops  = {
 };
 
 static const struct pci_driver si_sata_driver __pci_driver = {
-        .ops    = &si_sata_ops,
-        .vendor = 0x1095,
-        .device = 0x3114,
+	.ops    = &si_sata_ops,
+	.vendor = 0x1095,
+	.device = 0x3114,
 };
 
 static const struct pci_driver si_sata_driver_2 __pci_driver = {
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c
index 6fcf683fe6..9491a8ffbe 100644
--- a/src/drivers/usb/ehci_debug.c
+++ b/src/drivers/usb/ehci_debug.c
@@ -455,10 +455,10 @@ try_next_port:
 	dprintk(BIOS_INFO, "debug_port: %d\n", debug_port);
 	dprintk(BIOS_INFO, "n_ports:    %d\n", n_ports);
 
-        for (i = 1; i <= n_ports; i++) {
-                portsc = read32(&ehci_regs->port_status[i-1]);
-                dprintk(BIOS_INFO, "PORTSC #%d: %08x\n", i, portsc);
-        }
+	for (i = 1; i <= n_ports; i++) {
+		portsc = read32(&ehci_regs->port_status[i-1]);
+		dprintk(BIOS_INFO, "PORTSC #%d: %08x\n", i, portsc);
+	}
 
 	if (port_map_tried && (new_debug_port != debug_port)) {
 		if (--playtimes) {
diff --git a/src/drivers/usb/gadget.c b/src/drivers/usb/gadget.c
index 7a1f073a5c..ee18bd6b48 100644
--- a/src/drivers/usb/gadget.c
+++ b/src/drivers/usb/gadget.c
@@ -37,7 +37,7 @@ static int hub_port_status(const char * buf, int feature)
 /* After USB port reset, treat device number 0 as an USB hub. Assign it with
  * a device number hub_addr. Then apply enable and reset on downstream port.
  */
- static int dbgp_hub_enable(struct ehci_dbg_port *ehci_debug, unsigned char hub_addr,
+static int dbgp_hub_enable(struct ehci_dbg_port *ehci_debug, unsigned char hub_addr,
 	unsigned char port)
 {
 	char status[8];
diff --git a/src/drivers/usb/usb_ch9.h b/src/drivers/usb/usb_ch9.h
index 271b7d1cac..d7f39dde24 100644
--- a/src/drivers/usb/usb_ch9.h
+++ b/src/drivers/usb/usb_ch9.h
@@ -108,20 +108,20 @@
 #define USB_PID_DATA_TOGGLE	0x88
 
 struct usb_ctrlrequest {
-        u8  bRequestType;
-        u8  bRequest;
-        u16 wValue;
-        u16 wIndex;
-        u16 wLength;
+	u8  bRequestType;
+	u8  bRequest;
+	u16 wValue;
+	u16 wIndex;
+	u16 wLength;
 } __packed;
 
 struct usb_debug_descriptor {
-        u8  bLength;
-        u8  bDescriptorType;
+	u8  bLength;
+	u8  bDescriptorType;
 
-        /* bulk endpoints with 8 byte maxpacket */
-        u8  bDebugInEndpoint;
-        u8  bDebugOutEndpoint;
+	/* bulk endpoints with 8 byte maxpacket */
+	u8  bDebugInEndpoint;
+	u8  bDebugOutEndpoint;
 };
 
 #endif
diff --git a/src/drivers/xgi/common/vstruct.h b/src/drivers/xgi/common/vstruct.h
index 8172b9fe98..d14a18292a 100644
--- a/src/drivers/xgi/common/vstruct.h
+++ b/src/drivers/xgi/common/vstruct.h
@@ -50,7 +50,7 @@
 #define _VSTRUCT_H_
 
 struct SiS_PanelDelayTbl {
- 	unsigned char timer[2];
+	unsigned char timer[2];
 };
 
 struct SiS_LCDData {
@@ -166,7 +166,7 @@ struct SiS_Ext2 {
 };
 
 struct SiS_Part2PortTbl {
- 	unsigned char  CR[12];
+	unsigned char  CR[12];
 };
 
 struct SiS_CRT1Table {
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h
index dd5178219c..b9332e8126 100644
--- a/src/drivers/xgi/common/xgi_coreboot.h
+++ b/src/drivers/xgi/common/xgi_coreboot.h
@@ -176,30 +176,30 @@
 #define VB_VIDEOBRIDGE		(VB_SISBRIDGE | VB_LVDS | VB_CHRONTEL | VB_CONEXANT)
 
 enum _SIS_LCD_TYPE {
-    LCD_INVALID = 0,
-    LCD_800x600,
-    LCD_1024x768,
-    LCD_1280x1024,
-    LCD_1280x960,
-    LCD_640x480,
-    LCD_1600x1200,
-    LCD_1920x1440,
-    LCD_2048x1536,
-    LCD_320x240,	/* FSTN */
-    LCD_1400x1050,
-    LCD_1152x864,
-    LCD_1152x768,
-    LCD_1280x768,
-    LCD_1024x600,
-    LCD_320x240_2,	/* DSTN */
-    LCD_320x240_3,	/* DSTN */
-    LCD_848x480,
-    LCD_1280x800,
-    LCD_1680x1050,
-    LCD_1280x720,
-    LCD_1280x854,
-    LCD_CUSTOM,
-    LCD_UNKNOWN
+	LCD_INVALID = 0,
+	LCD_800x600,
+	LCD_1024x768,
+	LCD_1280x1024,
+	LCD_1280x960,
+	LCD_640x480,
+	LCD_1600x1200,
+	LCD_1920x1440,
+	LCD_2048x1536,
+	LCD_320x240,	/* FSTN */
+	LCD_1400x1050,
+	LCD_1152x864,
+	LCD_1152x768,
+	LCD_1280x768,
+	LCD_1024x600,
+	LCD_320x240_2,	/* DSTN */
+	LCD_320x240_3,	/* DSTN */
+	LCD_848x480,
+	LCD_1280x800,
+	LCD_1680x1050,
+	LCD_1280x720,
+	LCD_1280x854,
+	LCD_CUSTOM,
+	LCD_UNKNOWN
 };
 
 /* End code taken from Linux kernel 3.18.5 */
diff --git a/src/drivers/xgi/z9s/z9s.c b/src/drivers/xgi/z9s/z9s.c
index 4c1e44a828..dc4fd3cf19 100644
--- a/src/drivers/xgi/z9s/z9s.c
+++ b/src/drivers/xgi/z9s/z9s.c
@@ -59,7 +59,7 @@ static struct device_operations xgi_z9s_ops  = {
 };
 
 static const struct pci_driver xgi_z9s_driver __pci_driver = {
-        .ops    = &xgi_z9s_ops,
-        .vendor = PCI_VENDOR_ID_XGI,
-        .device = PCI_DEVICE_ID_XGI_20,
+	.ops    = &xgi_z9s_ops,
+	.vendor = PCI_VENDOR_ID_XGI,
+	.device = PCI_DEVICE_ID_XGI_20,
 };