diff --git a/drivers/power/bq25980_mmi_iio/bq25980_mmi_iio.c b/drivers/power/bq25980_mmi_iio/bq25980_mmi_iio.c
index c2cc54d0ed7f..e6466b22ff81 100644
--- a/drivers/power/bq25980_mmi_iio/bq25980_mmi_iio.c
+++ b/drivers/power/bq25980_mmi_iio/bq25980_mmi_iio.c
@@ -2483,7 +2483,7 @@ static int bq25980_charger_remove(struct i2c_client *client)
 
 	mutex_destroy(&bq->lock);
 	mutex_destroy(&bq->irq_complete);
-	devm_iio_device_unregister(bq->dev, bq->indio_dev);
+
 	dev_err(bq->dev,"remove Successfully\n");
 	return 0;
 }
diff --git a/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c b/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c
index c35d2600d59c..f03c6ffabee3 100644
--- a/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c
+++ b/drivers/power/mm8013c_fg_mmi/mm8013c_battery.c
@@ -877,7 +877,7 @@ static int mm8xxx_battery_setup(struct mm8xxx_device_info *di)
 	ps_desc->get_property = mm8xxx_battery_get_property;
 	ps_desc->external_power_changed = mm8xxx_external_power_changed;
 
-	di->psy = power_supply_register_no_ws(di->dev, ps_desc, &ps_cfg);
+	di->psy = power_supply_register(di->dev, ps_desc, &ps_cfg);
 	if (IS_ERR(di->psy)) {
 		dev_err(di->dev, "failed to register battery\n");
 		return PTR_ERR(di->psy);
@@ -1042,7 +1042,7 @@ static int mm8xxx_fake_battery_setup(struct mm8xxx_device_info *di)
 	ps_desc->get_property = mm8xxx_fake_battery_get_property;
 	ps_desc->external_power_changed = mm8xxx_fake_external_power_changed;
 
-	di->psy = power_supply_register_no_ws(di->dev, ps_desc, &ps_cfg);
+	di->psy = power_supply_register(di->dev, ps_desc, &ps_cfg);
 	if (IS_ERR(di->psy)) {
 		dev_err(di->dev, "failed to register battery\n");
 		return PTR_ERR(di->psy);