diff --git a/boards/arduino-common/include/periph_conf.h b/boards/arduino-common/include/periph_conf.h
index ea67ea05de4d12ef6c2fca48698c733fa5ac88e9..d19d20b914bcbb667d80168bf3c9548f011be336 100644
--- a/boards/arduino-common/include/periph_conf.h
+++ b/boards/arduino-common/include/periph_conf.h
@@ -79,7 +79,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           1           /* set to 0 to disable SPI */
-#define SPI_0_EN            1           /* remove once SPI rework is done */
 #define MEGA_PRR            PRR         /* Power Reduction Register is PRR */
 /** @} */
 
diff --git a/boards/arduino-mega2560/include/periph_conf.h b/boards/arduino-mega2560/include/periph_conf.h
index cf3d898f02e9549f48da48e50610057e0952ce24..45c1e89d3ffb37c1ca7a32172997a491c81185c0 100644
--- a/boards/arduino-mega2560/include/periph_conf.h
+++ b/boards/arduino-mega2560/include/periph_conf.h
@@ -96,7 +96,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           1           /* set to 0 to disable SPI */
-#define SPI_0_EN            1           /* remove once SPI rework is done */
 #define MEGA_PRR            PRR0        /* Power Reduction Register is PRR0 */
 /** @} */
 
diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h
index 9c107dde2a887824af202135142abb6fe038eeff..15a7bccbb4de8a1009022124a76faabff19b0e2f 100644
--- a/boards/avsextrem/include/periph_conf.h
+++ b/boards/avsextrem/include/periph_conf.h
@@ -60,7 +60,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           (1U)
-#define SPI_0_EN            (1)
 /** @} */
 
 #ifdef __cplusplus
diff --git a/boards/msb-430/include/periph_conf.h b/boards/msb-430/include/periph_conf.h
index 9a095761ee7fc594e79cb0d8be0937ddc76c52d4..1026d73e584d7f7718b2a23c76e898981f057f65 100644
--- a/boards/msb-430/include/periph_conf.h
+++ b/boards/msb-430/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           (1U)
-#define SPI_0_EN            (1U)
 
 /* SPI configuration */
 #define SPI_BASE            (USART_0)
diff --git a/boards/msb-430h/include/periph_conf.h b/boards/msb-430h/include/periph_conf.h
index 90f900727db300d381a4dac5c830333f21d48645..69b52c709f4ee1567989ad1aa65d9a5a8423dae6 100644
--- a/boards/msb-430h/include/periph_conf.h
+++ b/boards/msb-430h/include/periph_conf.h
@@ -74,7 +74,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           (1U)
-#define SPI_0_EN            (1U)
 
 /* SPI configuration */
 #define SPI_BASE            (USART_0)
diff --git a/boards/telosb/include/periph_conf.h b/boards/telosb/include/periph_conf.h
index 9aed1ac2072a17cbd08f56457779202081362bd6..39ecfcfe5f2a57dd48e5bc593d5f212899b14262 100644
--- a/boards/telosb/include/periph_conf.h
+++ b/boards/telosb/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           (1U)
-#define SPI_0_EN            (1U)
 
 /* SPI configuration */
 #define SPI_BASE            (USART_0)
diff --git a/boards/waspmote-pro/include/periph_conf.h b/boards/waspmote-pro/include/periph_conf.h
index a8b03d4afb1346ff4084089f2c1eab506fe0c61a..b7171a474c1d9c3a59a66fb7d9cdcc082cd3c4af 100644
--- a/boards/waspmote-pro/include/periph_conf.h
+++ b/boards/waspmote-pro/include/periph_conf.h
@@ -103,8 +103,7 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           1           /* set to 0 to disable SPI */
-#define SPI_0_EN            1           /* remove once SPI rework is done */
-#define MEGA_PRR            PRR0        /* Power Reduction Resgister */
+#define MEGA_PRR            PRR0        /* Power Reduction Register */
 /** @} */
 
 #ifdef __cplusplus
diff --git a/boards/wsn430-common/include/periph_conf.h b/boards/wsn430-common/include/periph_conf.h
index 0bcd94c1d1d632b2e26b7ef096679a1f8971afb4..2acd0553b783a3be4910c4454f5c6a2670e071ae 100644
--- a/boards/wsn430-common/include/periph_conf.h
+++ b/boards/wsn430-common/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           (1U)
-#define SPI_0_EN            (1U)
 
 /* SPI configuration */
 #define SPI_BASE            (USART_0)
diff --git a/boards/z1/include/periph_conf.h b/boards/z1/include/periph_conf.h
index e25c59e961a31c61823f811fc805d82dcae7312e..02bc391e3add132c73b2a5dea072e121603cdfb8 100644
--- a/boards/z1/include/periph_conf.h
+++ b/boards/z1/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
  * @{
  */
 #define SPI_NUMOF           (1U)
-#define SPI_0_EN            (1U)
 
 /* SPI configuration */
 #define SPI_USE_USCI
diff --git a/cpu/atmega_common/periph/spi.c b/cpu/atmega_common/periph/spi.c
index 9464f68ac9a791044e5e4a255087b0f34d3bf533..631d052c0bf108a6aad6c19c88f4d3bf69d193d2 100644
--- a/cpu/atmega_common/periph/spi.c
+++ b/cpu/atmega_common/periph/spi.c
@@ -41,7 +41,7 @@ void spi_init(spi_t bus)
     /* power off the SPI peripheral */
     MEGA_PRR |= (1 << PRSPI);
     /* trigger the pin configuration */
-    spi_init_pins(bus);;
+    spi_init_pins(bus);
 }
 
 void spi_init_pins(spi_t bus)