diff --git a/drivers/gpio/Kconfig.atmel_sam3 b/drivers/gpio/Kconfig.atmel_sam3
index 8685e607591..219534b1c1d 100644
--- a/drivers/gpio/Kconfig.atmel_sam3
+++ b/drivers/gpio/Kconfig.atmel_sam3
@@ -21,95 +21,91 @@ menuconfig GPIO_ATMEL_SAM3
 	depends on GPIO && SOC_ATMEL_SAM3
 	default n
 	help
-	Enable config options to support the PIO controllers
-	on Atmel SAM3 family processors.
+	  Enable config options to support the PIO controllers
+	  on Atmel SAM3 family processors.
 
-	Says n if not sure.
+	  Says n if not sure.
 
 if GPIO_ATMEL_SAM3
 
 config GPIO_ATMEL_SAM3_PORTA
 	bool "Enable driver for Atmel SAM3 PIO Port A"
-	depends on GPIO_ATMEL_SAM3
 	default n
 	help
-	Build the driver to utilize PIO controller Port A.
+	  Build the driver to utilize PIO controller Port A.
 
 config GPIO_ATMEL_SAM3_PORTA_DEV_NAME
 	string "Device name for Port A"
 	depends on GPIO_ATMEL_SAM3_PORTA
 	default "PIOA"
 	help
-	Device name for Port A.
+	  Device name for Port A.
 
 config GPIO_ATMEL_SAM3_PORTA_IRQ_PRI
 	int "Interrupt Priority for Port A"
 	depends on GPIO_ATMEL_SAM3_PORTA
 	default 3
 	help
-	Interrupt priority for Port A.
+	  Interrupt priority for Port A.
 
 config GPIO_ATMEL_SAM3_PORTB
 	bool "Enable driver for Atmel SAM3 PIO Port B"
-	depends on GPIO_ATMEL_SAM3
 	default n
 	help
-	Build the driver to utilize PIO controller Port B.
+	  Build the driver to utilize PIO controller Port B.
 
 config GPIO_ATMEL_SAM3_PORTB_DEV_NAME
 	string "Device name for Port B"
 	depends on GPIO_ATMEL_SAM3_PORTB
 	default "PIOB"
 	help
-	Device name for Port B.
+	  Device name for Port B.
 
 config GPIO_ATMEL_SAM3_PORTB_IRQ_PRI
 	int "Interrupt Priority for Port B"
 	depends on GPIO_ATMEL_SAM3_PORTB
 	default 3
 	help
-	Interrupt priority for Port B.
+	  Interrupt priority for Port B.
 
 config GPIO_ATMEL_SAM3_PORTC
 	bool "Enable driver for Atmel SAM3 PIO Port C"
-	depends on GPIO_ATMEL_SAM3
 	default n
 	help
-	Build the driver to utilize PIO controller Port C.
+	  Build the driver to utilize PIO controller Port C.
 
 config GPIO_ATMEL_SAM3_PORTC_DEV_NAME
 	string "Device name for Port C"
 	depends on GPIO_ATMEL_SAM3_PORTC
 	default "PIOC"
 	help
-	Device name for Port C.
+	  Device name for Port C.
 
 config GPIO_ATMEL_SAM3_PORTC_IRQ_PRI
 	int "Interrupt Priority for Port C"
 	depends on GPIO_ATMEL_SAM3_PORTC
 	default 3
 	help
-	Interrupt priority for Port C.
+	  Interrupt priority for Port C.
 
 config GPIO_ATMEL_SAM3_PORTD
 	bool "Enable driver for Atmel SAM3 PIO Port D"
-	depends on GPIO_ATMEL_SAM3
 	default n
 	help
-	Build the driver to utilize PIO controller Port D.
+	  Build the driver to utilize PIO controller Port D.
 
 config GPIO_ATMEL_SAM3_PORTD_DEV_NAME
 	string "Device name for Port D"
 	depends on GPIO_ATMEL_SAM3_PORTD
 	default "PIOD"
 	help
-	Device name for Port D.
+	  Device name for Port D.
 
 config GPIO_ATMEL_SAM3_PORTD_IRQ_PRI
 	int "Interrupt Priority for Port D"
 	depends on GPIO_ATMEL_SAM3_PORTD
 	default 3
 	help
-	Interrupt priority for Port D.
+	  Interrupt priority for Port D.
 
 endif # GPIO_ATMEL_SAM3
diff --git a/drivers/gpio/gpio_atmel_sam3.c b/drivers/gpio/gpio_atmel_sam3.c
index d789dcfe29e..381cb3e982e 100644
--- a/drivers/gpio/gpio_atmel_sam3.c
+++ b/drivers/gpio/gpio_atmel_sam3.c
@@ -284,7 +284,7 @@ static const struct gpio_driver_api gpio_sam3_drv_api_funcs = {
  * @param dev Device struct
  * @return 0 if successful, failed otherwise.
  */
-int gpio_sam3_init(struct device *dev)
+static int gpio_sam3_init(struct device *dev)
 {
 	const struct gpio_sam3_config *cfg = dev->config->config_info;