diff --git a/sound/soc/codecs/aw883xx/aw883xx.c b/sound/soc/codecs/aw883xx/aw883xx.c
index c19016b84479..5de9a62d7a58 100644
--- a/sound/soc/codecs/aw883xx/aw883xx.c
+++ b/sound/soc/codecs/aw883xx/aw883xx.c
@@ -2502,11 +2502,6 @@ static void aw883xx_i2c_remove(struct i2c_client *i2c)
 			gpio_to_irq(aw883xx->irq_gpio),
 			aw883xx);
 
-	if (gpio_is_valid(aw883xx->irq_gpio))
-		devm_gpio_free(&i2c->dev, aw883xx->irq_gpio);
-	if (gpio_is_valid(aw883xx->reset_gpio))
-		devm_gpio_free(&i2c->dev, aw883xx->reset_gpio);
-
 	sysfs_remove_group(&aw883xx->dev->kobj,
 			&aw883xx_attribute_group);
 
diff --git a/sound/soc/codecs/aw883xx/aw_calib.h b/sound/soc/codecs/aw883xx/aw_calib.h
index d9adee208af6..ca8370415f50 100644
--- a/sound/soc/codecs/aw883xx/aw_calib.h
+++ b/sound/soc/codecs/aw883xx/aw_calib.h
@@ -5,7 +5,6 @@
 
 /*#define AW_CALI_STORE_EXAMPLE*/
 
-#define AW_CALI_STORE_EXAMPLE
 #define AW_ERRO_CALI_RE_VALUE (0)
 #define AW_ERRO_CALI_F0_VALUE (2600)