diff --git a/targets/TARGET_WIZNET/TARGET_W7500x/gpio_irq_api.c b/targets/TARGET_WIZNET/TARGET_W7500x/gpio_irq_api.c
index d828460fdb..d64ee89246 100644
--- a/targets/TARGET_WIZNET/TARGET_W7500x/gpio_irq_api.c
+++ b/targets/TARGET_WIZNET/TARGET_W7500x/gpio_irq_api.c
@@ -115,7 +115,8 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
         obj->irq_n = PORT3_IRQn;
     
     obj->pin = pin;
-    
+    obj->event = EDGE_NONE;
+
     // Enable EXTI interrupt    
     NVIC_ClearPendingIRQ(obj->irq_n);
     NVIC_EnableIRQ(obj->irq_n);
@@ -145,7 +146,6 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable)
             obj->rise_null = 0;
         }
         else if (event == IRQ_FALL) {
-            //gpio->INTPOLSET &= ~obj->pin_index;
             gpio->INTPOLCLR |= obj->pin_index;
             obj->event = EDGE_FALL;
             obj->fall_null = 0;
diff --git a/targets/TARGET_WIZNET/TARGET_W7500x/pinmap.c b/targets/TARGET_WIZNET/TARGET_W7500x/pinmap.c
index 4b2929f252..4c1470e1a4 100644
--- a/targets/TARGET_WIZNET/TARGET_W7500x/pinmap.c
+++ b/targets/TARGET_WIZNET/TARGET_W7500x/pinmap.c
@@ -119,29 +119,25 @@ void pin_mode(PinName pin, PinMode pupd)
 
     switch(port_num) {
         case PortA:
-            if(pupd != 0)
-            {
+            if(pupd != 0) {
                 PA_PCR->Port[pin_num] &= 0xFFFFFFFC;
             }
             PA_PCR->Port[pin_num] |= pupd;
             break;
         case PortB:
-            if(pupd != 0)
-            {
+            if(pupd != 0) {
                 PB_PCR->Port[pin_num] &= 0xFFFFFFFC;
             }
             PB_PCR->Port[pin_num] |= pupd;
             break;
         case PortC:
-            if(pupd != 0)
-            {
+            if(pupd != 0) {
                 PC_PCR->Port[pin_num] &= 0xFFFFFFFC;
             }
             PC_PCR->Port[pin_num] |= pupd;
             break;
         case PortD:
-            if(pupd != 0)
-            {
+            if(pupd != 0) {
                 PD_PCR->Port[pin_num] &= 0xFFFFFFFC;
             }
             PD_PCR->Port[pin_num] |= pupd;