@@ -1225,8 +1225,8 @@ static int acpi_battery_add(struct acpi_device *device)
1225
1225
strscpy (acpi_device_name (device ), ACPI_BATTERY_DEVICE_NAME );
1226
1226
strscpy (acpi_device_class (device ), ACPI_BATTERY_CLASS );
1227
1227
device -> driver_data = battery ;
1228
- mutex_init ( & battery -> lock );
1229
- mutex_init ( & battery -> sysfs_lock );
1228
+ devm_mutex_init ( & device -> dev , & battery -> lock );
1229
+ devm_mutex_init ( & device -> dev , & battery -> sysfs_lock );
1230
1230
if (acpi_has_method (battery -> device -> handle , "_BIX" ))
1231
1231
set_bit (ACPI_BATTERY_XINFO_PRESENT , & battery -> flags );
1232
1232
@@ -1256,8 +1256,6 @@ static int acpi_battery_add(struct acpi_device *device)
1256
1256
unregister_pm_notifier (& battery -> pm_nb );
1257
1257
fail :
1258
1258
sysfs_remove_battery (battery );
1259
- mutex_destroy (& battery -> lock );
1260
- mutex_destroy (& battery -> sysfs_lock );
1261
1259
1262
1260
return result ;
1263
1261
}
@@ -1277,9 +1275,6 @@ static void acpi_battery_remove(struct acpi_device *device)
1277
1275
device_init_wakeup (& device -> dev , 0 );
1278
1276
unregister_pm_notifier (& battery -> pm_nb );
1279
1277
sysfs_remove_battery (battery );
1280
-
1281
- mutex_destroy (& battery -> lock );
1282
- mutex_destroy (& battery -> sysfs_lock );
1283
1278
}
1284
1279
1285
1280
#ifdef CONFIG_PM_SLEEP
0 commit comments